- Lauri
>From d17b2b557a3f5e2179f101d981c4ae783f19aa11 Mon Sep 17 00:00:00 2001 From: Lauri Kasanen <[email protected]> Date: Fri, 1 Jun 2012 17:03:34 +0300 Subject: [PATCH 2/3] configure, headers: Make sure every header has include guards
Signed-off-by: Lauri Kasanen <[email protected]> --- configure | 5 ++++- src/include/mk_connection.h | 5 +++++ src/include/mk_limits.h | 5 +++++ src/include/mk_method.h | 5 +++++ src/include/mk_mimetype.h | 5 +++++ 5 files changed, 24 insertions(+), 1 deletions(-) diff --git a/configure b/configure index a1be542..d84b07a 100755 --- a/configure +++ b/configure @@ -192,7 +192,10 @@ main() echo -n "Have fun! ;)" echo - echo "#define CC \"${CC}\"" > src/include/mk_env.h + echo "#ifndef MK_ENV_H" > src/include/mk_env.h + echo "#define MK_ENV_H" >> src/include/mk_env.h + echo "#define CC \"${CC}\"" >> src/include/mk_env.h + echo "#endif" >> src/include/mk_env.h } # Check accept4() function diff --git a/src/include/mk_connection.h b/src/include/mk_connection.h index ce21334..fd042f9 100644 --- a/src/include/mk_connection.h +++ b/src/include/mk_connection.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifndef MK_CONNECTION_H +#define MK_CONNECTION_H + #define MK_CONN_SWITCH_READ 0 #define MK_CONN_SWITCH_WRITE 1 @@ -28,3 +31,5 @@ int mk_conn_write(int socket); int mk_conn_error(int socket); int mk_conn_close(int socket); int mk_conn_timeout(int socket); + +#endif diff --git a/src/include/mk_limits.h b/src/include/mk_limits.h index c0a5d6e..f1d6aab 100644 --- a/src/include/mk_limits.h +++ b/src/include/mk_limits.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifndef MK_LIMITS_H +#define MK_LIMITS_H + /* Configuration */ #define MK_HOSTNAME_LEN 64 @@ -27,3 +30,5 @@ /* File system */ #define MK_PATH_BASE 128 + +#endif diff --git a/src/include/mk_method.h b/src/include/mk_method.h index 8b92631..34ce7b5 100644 --- a/src/include/mk_method.h +++ b/src/include/mk_method.h @@ -17,7 +17,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifndef MK_METHOD_H +#define MK_METHOD_H + /* method.c */ int mk_method_parse_data(struct client_session *cs, struct session_request *sr); mk_pointer mk_method_get_data(void *data, int size); long int mk_method_validate_content_length(const char *body, int body_len); + +#endif diff --git a/src/include/mk_mimetype.h b/src/include/mk_mimetype.h index b5b93f8..6b454b7 100644 --- a/src/include/mk_mimetype.h +++ b/src/include/mk_mimetype.h @@ -22,6 +22,9 @@ #include "mk_memory.h" #include "mk_list.h" +#ifndef MK_MIMETYPE_H +#define MK_MIMETYPE_H + #define MIMETYPE_DEFAULT_TYPE "text/plain\r\n" #define MIMETYPE_DEFAULT_NAME "default" @@ -35,3 +38,5 @@ struct mimetype *mimetype_default; void mk_mimetype_read_config(void); struct mimetype *mk_mimetype_find(mk_pointer * filename); + +#endif -- 1.7.2.1
_______________________________________________ Monkey mailing list [email protected] http://lists.monkey-project.com/listinfo/monkey
