Avoid inclusion of internal headers

Author: Sebastiano Merlino

configure.ac

@@ -72,6 +72,8 @@ PKG_CHECK_MODULES([LIBMICROHTTPD],[libmicrohttpd >= 0.9.7],[],[AC_MSG_ERROR("lib
 #AC_CHECK_HEADER([microhttpd.h],[],[AC_MSG_ERROR("Microhttpd header files not found. Please use a version >= 0.9.9.")])
 #AC_CHECK_LIB([microhttpd],[MHD_start_daemon],[],[AC_MSG_ERROR("Microhttpd header files not found. Please use a version >= 0.9.9.")])
 
+CXXFLAGS="-DHTTPSERVER_COMPILATION $CXXFLAGS"
+
 CXXFLAGS="$LIBMICROHTTPD_CFLAGS $CXXFLAGS"
 LDFLAGS="$LIBMICROHTTPD_LIBS $LD_FLAGS"
 

src/httpserver.hpp

@@ -1,5 +1,7 @@
-#ifndef _httpserver_hpp_
-#define _httpserver_hpp_
+#ifndef _HTTPSERVER_HPP_
+#define _HTTPSERVER_HPP_
+
+#define _HTTPSERVER_HPP_INSIDE_
 
 #ifdef SWIG
 %include "std_string.i"

src/httpserver/http_endpoint.hpp

@@ -17,6 +17,11 @@
      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
+
+#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
+#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
+#endif
+
 #ifndef _HTTP_ENDPOINT_HPP_
 #define _HTTP_ENDPOINT_HPP_
 

src/httpserver/http_request.hpp

@@ -17,6 +17,11 @@
      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
+
+#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
+#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
+#endif
+
 #ifndef _HTTP_REQUEST_HPP_
 #define _HTTP_REQUEST_HPP_
 

src/httpserver/http_resource.hpp

@@ -17,6 +17,11 @@
      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
+
+#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
+#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
+#endif
+
 #ifndef _http_resource_hpp_
 #define _http_resource_hpp_
 #include <map>

src/httpserver/http_response.hpp

@@ -17,6 +17,11 @@
      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
+
+#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
+#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
+#endif
+
 #ifndef _HTTP_RESPONSE_HPP_
 #define _HTTP_RESPONSE_HPP_
 #include <map>

src/httpserver/http_utils.hpp

@@ -18,6 +18,10 @@
 
 */
 
+#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
+#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
+#endif
+
 #ifndef _HTTPUTILS_H_
 #define _HTTPUTILS_H_
 

src/httpserver/string_utilities.hpp

@@ -17,6 +17,11 @@
      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
+
+#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
+#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
+#endif
+
 #ifndef _STRING_UTILITIES_H_
 #define _STRING_UTILITIES_H_
 

src/httpserver/webserver.hpp

@@ -17,6 +17,11 @@
      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
+
+#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
+#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
+#endif
+
 #ifndef _FRAMEWORK_WEBSERVER_HPP_
 #define _FRAMEWORK_WEBSERVER_HPP_