diff options
author | Laurent Deniel <laurent.deniel@free.fr> | 2000-08-11 13:37:21 +0000 |
---|---|---|
committer | Laurent Deniel <laurent.deniel@free.fr> | 2000-08-11 13:37:21 +0000 |
commit | 6a480953a956a2486e0b618bb02bed56faeac7bf (patch) | |
tree | 06a0d0c6356d97dfea11180d4ce22f5b278eefd6 /gtk/main.h | |
parent | 6ad00fc256b351823138519e5a594b3f0f068319 (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).
svn path=/trunk/; revision=2254
Diffstat (limited to 'gtk/main.h')
-rw-r--r-- | gtk/main.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk/main.h b/gtk/main.h index f846cfd9bb..fc92f327cd 100644 --- a/gtk/main.h +++ b/gtk/main.h @@ -1,7 +1,7 @@ -/* ethereal.h +/* main.h * Global defines, etc. * - * $Id: main.h,v 1.15 2000/08/03 12:44:39 gram Exp $ + * $Id: main.h,v 1.16 2000/08/11 13:32:58 deniel Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -30,9 +30,7 @@ #include "config.h" #endif -#ifndef __GLOBALS_H__ #include "globals.h" -#endif #ifdef WIN32 #define MONO_MEDIUM_FONT "-*-lucida console-medium-*-*-*-*-100-*-*-*-*-*-*" |