From 9940495d671da533da514572a70da10b339346ee Mon Sep 17 00:00:00 2001
From: lammertb <github@linocomm.net>
Date: Mon, 12 Dec 2016 11:46:14 +0100
Subject: [PATCH] Moved memory functions to own header file

---
 Makefile                                  | 30 +++++++++++++++
 src/httplib_addenv.c                      |  1 +
 src/httplib_close_all_listening_sockets.c |  1 +
 src/httplib_close_connection.c            |  1 +
 src/httplib_closedir.c                    |  1 +
 src/httplib_connect_client.c              |  1 +
 src/httplib_connect_socket.c              |  1 +
 src/httplib_connect_websocket_client.c    |  1 +
 src/httplib_dir_scan_callback.c           |  1 +
 src/httplib_free_context.c                |  1 +
 src/httplib_handle_cgi_request.c          |  1 +
 src/httplib_handle_directory_request.c    |  1 +
 src/httplib_handle_form_request.c         |  1 +
 src/httplib_initialize_ssl.c              |  1 +
 src/httplib_main.h                        | 19 +---------
 src/httplib_malloc.c                      |  1 +
 src/httplib_memory.h                      | 45 +++++++++++++++++++++++
 src/httplib_opendir.c                     |  1 +
 src/httplib_prepare_cgi_environment.c     |  1 +
 src/httplib_process_new_connection.c      |  1 +
 src/httplib_read_websocket.c              |  1 +
 src/httplib_realloc2.c                    |  1 +
 src/httplib_set_handler_type.c            |  1 +
 src/httplib_set_ports_option.c            |  1 +
 src/httplib_ssl_get_client_cert_info.c    |  1 +
 src/httplib_start.c                       |  1 +
 src/httplib_strndup.c                     |  1 +
 src/httplib_tls_dtor.c                    |  1 +
 src/httplib_uninitialize_ssl.c            |  1 +
 src/httplib_vprintf.c                     |  1 +
 src/httplib_websocket_client_thread.c     |  1 +
 src/httplib_websocket_client_write.c      |  1 +
 src/httplib_worker_thread.c               |  1 +
 33 files changed, 106 insertions(+), 18 deletions(-)
 create mode 100644 src/httplib_memory.h

diff --git a/Makefile b/Makefile
index 5d18ce18..905ebab5 100644
--- a/Makefile
+++ b/Makefile
@@ -399,6 +399,7 @@ ${OBJDIR}httplib_accept_new_connection${OBJEXT}				: ${SRCDIR}httplib_accept_new
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_addenv${OBJEXT}					: ${SRCDIR}httplib_addenv.c					\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_atomic_dec${OBJEXT}					: ${SRCDIR}httplib_atomic_dec.c					\
@@ -426,9 +427,11 @@ ${OBJDIR}httplib_check_password${OBJEXT}				: ${SRCDIR}httplib_check_password.c
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_close_all_listening_sockets${OBJDIR}			: ${SRCDIR}httplib_close_all_listening_sockets.c		\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_close_connection${OBJEXT}				: ${SRCDIR}httplib_close_connection.c				\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_pthread.h					\
 									  ${SRCDIR}httplib_main.h
 
@@ -436,6 +439,7 @@ ${OBJDIR}httplib_close_socket_gracefully${OBJEXT}			: ${SRCDIR}httplib_close_soc
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_closedir${OBJEXT}					: ${SRCDIR}httplib_closedir.c					\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_compare_dir_entries${OBJEXT}				: ${SRCDIR}httplib_compare_dir_entries.c			\
@@ -445,13 +449,16 @@ ${OBJDIR}httplib_config_options${OBJEXT}				: ${SRCDIR}httplib_config_options.c
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_connect_client${OBJEXT}				: ${SRCDIR}httplib_connect_client.c				\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_pthread.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_connect_socket${OBJEXT}				: ${SRCDIR}httplib_connect_socket.c				\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_connect_websocket_client${OBJEXT}			: ${SRCDIR}httplib_connect_websocket_client.c			\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_construct_etag${OBJEXT}				: ${SRCDIR}httplib_construct_etag.c				\
@@ -471,6 +478,7 @@ ${OBJDIR}httplib_difftimespec${OBJEXT}					: ${SRCDIR}httplib_difftimespec.c
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_dir_scan_callback${OBJEXT}				: ${SRCDIR}httplib_dir_scan_callback.c				\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_discard_unread_request_data${OBJEXT}			: ${SRCDIR}httplib_discard_unread_request_data.c		\
@@ -501,6 +509,7 @@ ${OBJDIR}httplib_forward_body_data${OBJEXT}				: ${SRCDIR}httplib_forward_body_d
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_free_context${OBJEXT}					: ${SRCDIR}httplib_free_context.c				\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_pthread.h					\
 									  ${SRCDIR}httplib_main.h
 
@@ -583,15 +592,18 @@ ${OBJDIR}httplib_gmt_time_string${OBJEXT}				: ${SRCDIR}httplib_gmt_time_string.
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_handle_cgi_request${OBJEXT}				: ${SRCDIR}httplib_handle_cgi_request.c				\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_handle_directory_request${OBJEXT}			: ${SRCDIR}httplib_handle_directory_request.c			\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_handle_file_based_request${OBJEXT}			: ${SRCDIR}httplib_handle_file_based_request.c			\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_handle_form_request${OBJEXT}				: ${SRCDIR}httplib_handle_form_request.c			\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_handle_not_modified_static_file_request${OBJEXT}	: ${SRCDIR}httplib_handle_not_modified_static_file_request.c	\
@@ -616,6 +628,7 @@ ${OBJDIR}httplib_inet_pton${OBJEXT}					: ${SRCDIR}httplib_inet_pton.c					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_initialize_ssl${OBJEXT}				: ${SRCDIR}httplib_initialize_ssl.c				\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_pthread.h					\
 									  ${SRCDIR}httplib_main.h
 
@@ -667,6 +680,7 @@ ${OBJDIR}httplib_lowercase${OBJEXT}					: ${SRCDIR}httplib_lowercase.c					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_malloc${OBJEXT}					: ${SRCDIR}httplib_malloc.c					\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_master_thread${OBJEXT}					: ${SRCDIR}httplib_master_thread.c				\
@@ -697,6 +711,7 @@ ${OBJDIR}httplib_open_auth_file${OBJEXT}				: ${SRCDIR}httplib_open_auth_file.c
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_opendir${OBJEXT}					: ${SRCDIR}httplib_opendir.c					\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_parse_auth_header${OBJEXT}				: ${SRCDIR}httplib_parse_auth_header.c				\
@@ -724,6 +739,7 @@ ${OBJDIR}httplib_poll${OBJEXT}						: ${SRCDIR}httplib_poll.c					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_prepare_cgi_environment${OBJEXT}			: ${SRCDIR}httplib_prepare_cgi_environment.c			\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_print_dir_entry${OBJEXT}				: ${SRCDIR}httplib_print_dir_entry.c				\
@@ -733,6 +749,7 @@ ${OBJDIR}httplib_printf${OBJEXT}					: ${SRCDIR}httplib_printf.c					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_process_new_connection${OBJEXT}			: ${SRCDIR}httplib_process_new_connection.c			\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_produce_socket${OBJEXT}				: ${SRCDIR}httplib_produce_socket.c				\
@@ -764,12 +781,14 @@ ${OBJDIR}httplib_read_request${OBJEXT}					: ${SRCDIR}httplib_read_request.c
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_read_websocket${OBJEXT}				: ${SRCDIR}httplib_read_websocket.c				\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_readdir${OBJEXT}					: ${SRCDIR}httplib_readdir.c					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_realloc2${OBJEXT}					: ${SRCDIR}httplib_realloc2.c					\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_redirect_to_https_port${OBJEXT}			: ${SRCDIR}httplib_redirect_to_https_port.c			\
@@ -834,12 +853,14 @@ ${OBJDIR}httplib_set_gpass_option${OBJEXT}				: ${SRCDIR}httplib_set_gpass_optio
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_set_handler_type${OBJEXT}				: ${SRCDIR}httplib_set_handler_type.c				\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_set_non_blocking_mode${OBJEXT}				: ${SRCDIR}httplib_set_non_blocking_mode.c			\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_set_ports_option${OBJEXT}				: ${SRCDIR}httplib_set_ports_option.c				\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_set_request_handler${OBJEXT}				: ${SRCDIR}httplib_set_request_handler.c			\
@@ -897,6 +918,7 @@ ${OBJDIR}httplib_ssl_error${OBJEXT}					: ${SRCDIR}httplib_ssl_error.c					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_ssl_get_client_cert_info${OBJEXT}			: ${SRCDIR}httplib_ssl_get_client_cert_info.c			\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_ssl_get_protocol${OBJEXT}				: ${SRCDIR}httplib_ssl_get_protocol.c				\
@@ -917,6 +939,7 @@ ${OBJDIR}httplib_sslize${OBJEXT}					: ${SRCDIR}httplib_sslize.c					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_start${OBJEXT}						: ${SRCDIR}httplib_start.c					\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_pthread.h					\
 									  ${SRCDIR}httplib_main.h
 
@@ -951,6 +974,7 @@ ${OBJDIR}httplib_strncasecmp${OBJEXT}					: ${SRCDIR}httplib_strncasecmp.c				\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_strndup${OBJEXT}					: ${SRCDIR}httplib_strndup.c					\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_substitute_index_file${OBJEXT}				: ${SRCDIR}httplib_substitute_index_file.c			\
@@ -963,10 +987,12 @@ ${OBJDIR}httplib_timer${OBJEXT}						: ${SRCDIR}httplib_timer.c					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_tls_dtor${OBJEXT}					: ${SRCDIR}httplib_tls_dtor.c					\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_pthread.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_uninitialize_ssl${OBJEXT}				: ${SRCDIR}httplib_uninitialize_ssl.c				\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_pthread.h					\
 									  ${SRCDIR}httplib_main.h
 
@@ -980,15 +1006,18 @@ ${OBJDIR}httplib_version${OBJEXT}					: ${SRCDIR}httplib_version.c					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_vprintf${OBJEXT}					: ${SRCDIR}httplib_vprintf.c					\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_vsnprintf${OBJEXT}					: ${SRCDIR}httplib_vsnprintf.c					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_websocket_client_thread${OBJEXT}			: ${SRCDIR}httplib_websocket_client_thread.c			\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_websocket_client_write${OBJEXT}			: ${SRCDIR}httplib_websocket_client_write.c			\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_websocket_write${OBJEXT}				: ${SRCDIR}httplib_websocket_write.c				\
@@ -998,6 +1027,7 @@ ${OBJDIR}httplib_websocket_write_exec${OBJEXT}				: ${SRCDIR}httplib_websocket_w
 									  ${SRCDIR}httplib_main.h
 
 ${OBJDIR}httplib_worker_thread${OBJEXT}					: ${SRCDIR}httplib_worker_thread.c				\
+									  ${SRCDIR}httplib_memory.h					\
 									  ${SRCDIR}httplib_pthread.h					\
 									  ${SRCDIR}httplib_main.h
 
diff --git a/src/httplib_addenv.c b/src/httplib_addenv.c
index 5a185940..d215a6eb 100644
--- a/src/httplib_addenv.c
+++ b/src/httplib_addenv.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_close_all_listening_sockets.c b/src/httplib_close_all_listening_sockets.c
index 8d34a593..7411ecd7 100644
--- a/src/httplib_close_all_listening_sockets.c
+++ b/src/httplib_close_all_listening_sockets.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_close_connection.c b/src/httplib_close_connection.c
index 0737cb24..967f5a5f 100644
--- a/src/httplib_close_connection.c
+++ b/src/httplib_close_connection.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_closedir.c b/src/httplib_closedir.c
index c98e8b75..9ada935a 100644
--- a/src/httplib_closedir.c
+++ b/src/httplib_closedir.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_connect_client.c b/src/httplib_connect_client.c
index 24d910e7..ca7800c7 100644
--- a/src/httplib_connect_client.c
+++ b/src/httplib_connect_client.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_connect_socket.c b/src/httplib_connect_socket.c
index 736bdd70..35e5d343 100644
--- a/src/httplib_connect_socket.c
+++ b/src/httplib_connect_socket.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_connect_websocket_client.c b/src/httplib_connect_websocket_client.c
index 548bf397..c8947732 100644
--- a/src/httplib_connect_websocket_client.c
+++ b/src/httplib_connect_websocket_client.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_dir_scan_callback.c b/src/httplib_dir_scan_callback.c
index ddba1258..d8bbf888 100644
--- a/src/httplib_dir_scan_callback.c
+++ b/src/httplib_dir_scan_callback.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_free_context.c b/src/httplib_free_context.c
index de5caecb..4eb34635 100644
--- a/src/httplib_free_context.c
+++ b/src/httplib_free_context.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_handle_cgi_request.c b/src/httplib_handle_cgi_request.c
index 1a966603..57af3443 100644
--- a/src/httplib_handle_cgi_request.c
+++ b/src/httplib_handle_cgi_request.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_handle_directory_request.c b/src/httplib_handle_directory_request.c
index 516a6a74..8b203ea5 100644
--- a/src/httplib_handle_directory_request.c
+++ b/src/httplib_handle_directory_request.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_handle_form_request.c b/src/httplib_handle_form_request.c
index 5d17338f..0fc21aac 100644
--- a/src/httplib_handle_form_request.c
+++ b/src/httplib_handle_form_request.c
@@ -24,6 +24,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_initialize_ssl.c b/src/httplib_initialize_ssl.c
index bd985714..6adca195 100644
--- a/src/httplib_initialize_ssl.c
+++ b/src/httplib_initialize_ssl.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_main.h b/src/httplib_main.h
index 3ade8d75..b421ceb7 100644
--- a/src/httplib_main.h
+++ b/src/httplib_main.h
@@ -1000,7 +1000,7 @@ int			XX_httplib_is_valid_http_method( const char *method );
 int			XX_httplib_is_valid_port( unsigned long port );
 int			XX_httplib_is_websocket_protocol( const struct mg_connection *conn );
 int			XX_httplib_join_thread( pthread_t threadid );
-int			XX_httplib_kill(pid_t pid, int sig_num);
+int			XX_httplib_kill( pid_t pid, int sig_num );
 void *			XX_httplib_load_dll( struct mg_context *ctx, const char *dll_name, struct ssl_func *sw );
 void			XX_httplib_log_access( const struct mg_connection *conn );
 int			XX_httplib_lowercase( const char *s );
@@ -1031,7 +1031,6 @@ int			XX_httplib_read_auth_file( struct file *filep, struct read_auth_file_struc
 int			XX_httplib_read_request( FILE *fp, struct mg_connection *conn, char *buf, int bufsiz, int *nread );
 void			XX_httplib_read_websocket( struct mg_connection *conn, mg_websocket_data_handler ws_data_handler, void *callback_data );
 struct dirent *		XX_httplib_readdir( DIR *dir );
-void *			XX_httplib_realloc2( void *ptr, size_t size );
 void			XX_httplib_redirect_to_https_port( struct mg_connection *conn, int ssl_index );
 int			XX_httplib_refresh_trust( struct mg_connection *conn );
 int			XX_httplib_remove( const struct mg_connection *conn, const char *path );
@@ -1119,22 +1118,6 @@ void *			XX_httplib_worker_thread( void *thread_func_param );
 extern pthread_mutexattr_t	XX_httplib_pthread_mutex_attr;
 #endif /* _WIN32 */
 
-#if defined(MEMORY_DEBUGGING)
-void *			XX_httplib_calloc_ex( size_t count, size_t size, const char *file, unsigned line );
-void			XX_httplib_free_ex( void *memory, const char *file, unsigned line );
-void *			XX_httplib_malloc_ex( size_t size, const char *file, unsigned line );
-void *			XX_httplib_realloc_ex( void *memory, size_t newsize, const char *file, unsigned line );
-#define			XX_httplib_calloc(a, b) XX_httplib_calloc_ex(a, b, __FILE__, __LINE__)
-#define			XX_httplib_free(a) XX_httplib_free_ex(a, __FILE__, __LINE__)
-#define			XX_httplib_malloc(a) XX_httplib_malloc_ex(a, __FILE__, __LINE__)
-#define			XX_httplib_realloc(a, b) XX_httplib_realloc_ex(a, b, __FILE__, __LINE__)
-#else  /* MEMORY_DEBUGGING */
-void *			XX_httplib_calloc( size_t a, size_t b );
-void			XX_httplib_free( void *a );
-void *			XX_httplib_malloc( size_t a );
-void *			XX_httplib_realloc( void *a, size_t b );
-#endif  /* MEMORY_DEBUGGING */
-
 extern const struct uriprot_tp	XX_httplib_abs_uri_protocols[];
 extern struct mg_option		XX_httplib_config_options[];
 extern int			XX_httplib_cryptolib_users;
diff --git a/src/httplib_malloc.c b/src/httplib_malloc.c
index 1ac46aa5..0576f3dc 100644
--- a/src/httplib_malloc.c
+++ b/src/httplib_malloc.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 #if defined(MEMORY_DEBUGGING)
diff --git a/src/httplib_memory.h b/src/httplib_memory.h
new file mode 100644
index 00000000..8721cc4d
--- /dev/null
+++ b/src/httplib_memory.h
@@ -0,0 +1,45 @@
+/* 
+ * Copyright (C) 2016 Lammert Bies
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+
+#if defined(MEMORY_DEBUGGING)
+
+void *			XX_httplib_calloc_ex( size_t count, size_t size, const char *file, unsigned line );
+void			XX_httplib_free_ex( void *memory, const char *file, unsigned line );
+void *			XX_httplib_malloc_ex( size_t size, const char *file, unsigned line );
+void *			XX_httplib_realloc_ex( void *memory, size_t newsize, const char *file, unsigned line );
+#define			XX_httplib_calloc(a, b) XX_httplib_calloc_ex(a, b, __FILE__, __LINE__)
+#define			XX_httplib_free(a) XX_httplib_free_ex(a, __FILE__, __LINE__)
+#define			XX_httplib_malloc(a) XX_httplib_malloc_ex(a, __FILE__, __LINE__)
+#define			XX_httplib_realloc(a, b) XX_httplib_realloc_ex(a, b, __FILE__, __LINE__)
+
+#else  /* MEMORY_DEBUGGING */
+
+void *			XX_httplib_calloc( size_t a, size_t b );
+void			XX_httplib_free( void *a );
+void *			XX_httplib_malloc( size_t a );
+void *			XX_httplib_realloc( void *a, size_t b );
+
+#endif  /* MEMORY_DEBUGGING */
+
+void *			XX_httplib_realloc2( void *ptr, size_t size );
diff --git a/src/httplib_opendir.c b/src/httplib_opendir.c
index e3e767c3..fbacbc27 100644
--- a/src/httplib_opendir.c
+++ b/src/httplib_opendir.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_prepare_cgi_environment.c b/src/httplib_prepare_cgi_environment.c
index 7047ba5c..cdc8c4cc 100644
--- a/src/httplib_prepare_cgi_environment.c
+++ b/src/httplib_prepare_cgi_environment.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_process_new_connection.c b/src/httplib_process_new_connection.c
index 08e92a19..ed4cfaba 100644
--- a/src/httplib_process_new_connection.c
+++ b/src/httplib_process_new_connection.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_read_websocket.c b/src/httplib_read_websocket.c
index cbd71377..ae7b9f4a 100644
--- a/src/httplib_read_websocket.c
+++ b/src/httplib_read_websocket.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_realloc2.c b/src/httplib_realloc2.c
index 1ebd177c..f0c7e827 100644
--- a/src/httplib_realloc2.c
+++ b/src/httplib_realloc2.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 /* Behaves like realloc(), but frees original pointer on failure */
diff --git a/src/httplib_set_handler_type.c b/src/httplib_set_handler_type.c
index 45148f6f..05076065 100644
--- a/src/httplib_set_handler_type.c
+++ b/src/httplib_set_handler_type.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_set_ports_option.c b/src/httplib_set_ports_option.c
index 46355844..0cb1b040 100644
--- a/src/httplib_set_ports_option.c
+++ b/src/httplib_set_ports_option.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_ssl_get_client_cert_info.c b/src/httplib_ssl_get_client_cert_info.c
index 8c96b16a..a0f22ae9 100644
--- a/src/httplib_ssl_get_client_cert_info.c
+++ b/src/httplib_ssl_get_client_cert_info.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_start.c b/src/httplib_start.c
index cd6a8e7e..b2e6804f 100644
--- a/src/httplib_start.c
+++ b/src/httplib_start.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_strndup.c b/src/httplib_strndup.c
index 46c639c3..b2df256c 100644
--- a/src/httplib_strndup.c
+++ b/src/httplib_strndup.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 char * XX_httplib_strndup( const char *ptr, size_t len ) {
diff --git a/src/httplib_tls_dtor.c b/src/httplib_tls_dtor.c
index 25639ea4..f48432a3 100644
--- a/src/httplib_tls_dtor.c
+++ b/src/httplib_tls_dtor.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_uninitialize_ssl.c b/src/httplib_uninitialize_ssl.c
index 0019bc76..417b4802 100644
--- a/src/httplib_uninitialize_ssl.c
+++ b/src/httplib_uninitialize_ssl.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_vprintf.c b/src/httplib_vprintf.c
index 6a3d75fb..376a1d8c 100644
--- a/src/httplib_vprintf.c
+++ b/src/httplib_vprintf.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_websocket_client_thread.c b/src/httplib_websocket_client_thread.c
index 4ff0cc40..fa89fb1f 100644
--- a/src/httplib_websocket_client_thread.c
+++ b/src/httplib_websocket_client_thread.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_websocket_client_write.c b/src/httplib_websocket_client_write.c
index e5a64466..d6e758ed 100644
--- a/src/httplib_websocket_client_write.c
+++ b/src/httplib_websocket_client_write.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 
 
 
diff --git a/src/httplib_worker_thread.c b/src/httplib_worker_thread.c
index e9a6f647..7727aef7 100644
--- a/src/httplib_worker_thread.c
+++ b/src/httplib_worker_thread.c
@@ -25,6 +25,7 @@
 
 
 #include "httplib_main.h"
+#include "httplib_memory.h"
 #include "httplib_pthread.h"