summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-01-09 05:33:27 +0000
committerJeremy Allison <jra@samba.org>1998-01-09 05:33:27 +0000
commit0d1933fefc3685cc2d5e48e05a323f5ef81be555 (patch)
treee5dee5b93d18a9fe5a8a7be214c7b5058a46383a /source3/include
parent89450e370cb63160b7d8f0965e865dd73f56dd66 (diff)
downloadsamba-0d1933fefc3685cc2d5e48e05a323f5ef81be555.tar.gz
samba-0d1933fefc3685cc2d5e48e05a323f5ef81be555.tar.bz2
samba-0d1933fefc3685cc2d5e48e05a323f5ef81be555.zip
docs/Support.txt: Removed consultant.
source/Makefile: Added Volker's comment. source/nmbd_become_lmb.c: source/nmbd_browsesync.c: source/nmbd_incomingdgrams.c: Fixed userdata alignment problems. source/mem_man/mem_man.c: source/mem_man/mem_man.h: added smb_ prefix to stop namespace collisions. Jeremy. (This used to be commit 4c8af3bc9f43b2427609cbeecb7940b1753a9a1c)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index e26c1889a1..a8471d0c2d 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -437,18 +437,18 @@ void mdfour(unsigned char *out, unsigned char *in, int n);
/*The following definitions come from mem_man/mem_man.c */
-void *mem_malloc(size_t size,char *file,int line);
-char *mem_strdup(char *s, char *file, int line);
-int mem_free(void *ptr,char *file,int line);
-void mem_write_info(void *ptr,FILE *outfile);
-char *mem_query_file(void *ptr);
-int mem_query_line(void *ptr);
-int mem_test(void *ptr);
-void mem_write_status(FILE *outfile);
-void mem_write_verbose(FILE *outfile);
-void mem_write_errors(FILE *outfile);
-void mem_set_multiplier(int multiplier);
-void *mem_resize(void *ptr,size_t newsize);
+void *smb_mem_malloc(size_t size,char *file,int line);
+char *smb_mem_strdup(char *s, char *file, int line);
+int smb_mem_free(void *ptr,char *file,int line);
+void smb_mem_write_info(void *ptr,FILE *outfile);
+char *smb_mem_query_file(void *ptr);
+int smb_mem_query_line(void *ptr);
+int smb_mem_test(void *ptr);
+void smb_mem_write_status(FILE *outfile);
+void smb_mem_write_verbose(FILE *outfile);
+void smb_mem_write_errors(FILE *outfile);
+void smb_mem_set_multiplier(int multiplier);
+void *smb_mem_resize(void *ptr,size_t newsize);
/*The following definitions come from message.c */