diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 17:29:39 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 17:29:39 +0100 |
| commit | 41e44d695872f96be77640c847181742e5a1ec5f (patch) | |
| tree | 1548bfcccfd02854c513a04b99c817623f02371b | |
| parent | 28d374ec159b9af405a9ef128e8439ac42245a82 (diff) | |
| download | samba-41e44d695872f96be77640c847181742e5a1ec5f.tar.gz samba-41e44d695872f96be77640c847181742e5a1ec5f.tar.bz2 samba-41e44d695872f96be77640c847181742e5a1ec5f.zip | |
Remove MIN, MAX, slprintf, vslprintf defines already provided by libreplace.
| -rw-r--r-- | source3/include/includes.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index ece819938f..c1da09e2f8 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -524,14 +524,6 @@ struct timespec { }; #endif -#ifndef MIN -#define MIN(a,b) ((a)<(b)?(a):(b)) -#endif - -#ifndef MAX -#define MAX(a,b) ((a)>(b)?(a):(b)) -#endif - #ifdef HAVE_BROKEN_GETGROUPS #define GID_T int #else @@ -720,7 +712,7 @@ enum flush_reason_enum { #include "modules/nfs4_acls.h" #include "nsswitch/libwbclient/wbclient.h" -/***** automatically generated prototypes *****/ +/***** prototypes *****/ #ifndef NO_PROTO_H #include "proto.h" #endif @@ -893,11 +885,6 @@ int smb_xvasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE( int asprintf_strupper_m(char **strp, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3); char *talloc_asprintf_strupper_m(TALLOC_CTX *t, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3); -/* we used to use these fns, but now we have good replacements - for snprintf and vsnprintf */ -#define slprintf snprintf -#define vslprintf vsnprintf - /* * Veritas File System. Often in addition to native. * Quotas different. |