diff options
author | deniel <deniel@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-08-11 13:37:21 +0000 |
---|---|---|
committer | deniel <deniel@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-08-11 13:37:21 +0000 |
commit | 039a59eeca21c560b7964adf0a81d1fc42d21efb (patch) | |
tree | 06a0d0c6356d97dfea11180d4ce22f5b278eefd6 /snprintf.h | |
parent | ae95eec8f14f842fd84043dba8da12f369f9bb5e (diff) |
Miscellaneous code cleaning
- add <stdarg.h> or <varargs.h> in snprintf.h
and remove those inclusions in the other #ifdef NEED_SNPRINTF_H codes
- remove the check of multiple inclusions in source (.c) code
(there is a bit loss of _cpp_ performance, but I prefer the gain of
code reading and maintenance; and nowadays, disk caches and VM are
correctly optimized ;-).
- protect all (well almost) header files against multiple inclusions
- add header (i.e. GPL license) in some include files
- reorganize a bit the way header files are included:
First:
#include <system_include_files>
#include <external_package_include_files (e.g. gtk, glib etc.)>
Then
#include "ethereal_include_files"
with the correct HAVE_XXX or NEED_XXX protections.
- add some HAVE_XXX checks before including some system header files
- add the same HAVE_XXX in wiretap as in ethereal
Please forgive me, if I break something (I've only compiled and regression
tested on Linux).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2254 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'snprintf.h')
-rw-r--r-- | snprintf.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/snprintf.h b/snprintf.h index 62f57789b0..169f4ed7a8 100644 --- a/snprintf.h +++ b/snprintf.h @@ -1,3 +1,13 @@ + +#ifndef __ETHEREAL_SNPRINTF_H__ +#define __ETHEREAL_SNPRINTF_H__ + +#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__ +# include <stdarg.h> +#else +# include <varargs.h> +#endif + extern int vsnprintf(char *string, size_t length, const char * format, va_list args); @@ -7,3 +17,5 @@ extern int snprintf(char *string, size_t length, const char * format, ...); extern int snprintf(char *string, size_t length, const char * format, int va_alist); #endif + +#endif |