aboutsummaryrefslogtreecommitdiff
path: root/lib/memdebug.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-01-29 13:56:45 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-01-29 13:56:45 +0000
commit4d17d6876e4b2f08380812c4ec113073b0a14639 (patch)
tree7283f07518be4c7250d72ac89c38729563ffa642 /lib/memdebug.c
parent0d6236f7e10468f75d09796ba9640c9054ab1f04 (diff)
Dan Fandrich's cleanup patch to make pedantic compiler options cause less
warnings. Minor edits by me.
Diffstat (limited to 'lib/memdebug.c')
-rw-r--r--lib/memdebug.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/memdebug.c b/lib/memdebug.c
index 7bb3fea34..aea6f324b 100644
--- a/lib/memdebug.c
+++ b/lib/memdebug.c
@@ -41,7 +41,8 @@
#include <unistd.h>
#endif
-/* DONT include memdebug.h here! */
+#define MEMDEBUG_NODEFINES /* don't redefine the standard functions */
+#include "memdebug.h"
struct memdebug {
int size;
@@ -194,7 +195,8 @@ void curl_dofree(void *ptr, int line, const char *source)
fprintf(logfile, "MEM %s:%d free(%p)\n", source, line, ptr);
}
-int curl_socket(int domain, int type, int protocol, int line, char *source)
+int curl_socket(int domain, int type, int protocol, int line,
+ const char *source)
{
int sockfd=(socket)(domain, type, protocol);
if(logfile && (sockfd!=-1))
@@ -214,7 +216,7 @@ int curl_accept(int s, struct sockaddr *addr, socklen_t *addrlen,
}
/* this is our own defined way to close sockets on *ALL* platforms */
-int curl_sclose(int sockfd, int line, char *source)
+int curl_sclose(int sockfd, int line, const char *source)
{
int res=sclose(sockfd);
if(logfile)