aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/column_prefs.c
diff options
context:
space:
mode:
authorLaurent Deniel <laurent.deniel@free.fr>2000-08-11 13:37:21 +0000
committerLaurent Deniel <laurent.deniel@free.fr>2000-08-11 13:37:21 +0000
commit6a480953a956a2486e0b618bb02bed56faeac7bf (patch)
tree06a0d0c6356d97dfea11180d4ce22f5b278eefd6 /gtk/column_prefs.c
parent6ad00fc256b351823138519e5a594b3f0f068319 (diff)
downloadwireshark-6a480953a956a2486e0b618bb02bed56faeac7bf.tar.gz
wireshark-6a480953a956a2486e0b618bb02bed56faeac7bf.tar.bz2
wireshark-6a480953a956a2486e0b618bb02bed56faeac7bf.zip
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/column_prefs.c')
-rw-r--r--gtk/column_prefs.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c
index f206310783..97b23082a7 100644
--- a/gtk/column_prefs.c
+++ b/gtk/column_prefs.c
@@ -1,7 +1,7 @@
/* column_prefs.c
* Dialog box for column preferences
*
- * $Id: column_prefs.c,v 1.1 2000/01/10 01:43:58 guy Exp $
+ * $Id: column_prefs.c,v 1.2 2000/08/11 13:33:04 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -29,17 +29,10 @@
#include <errno.h>
-#ifndef __GLOBALS_H__
#include "globals.h"
-#endif
-
#include "column_prefs.h"
#include "gtkglobals.h"
-
-#ifndef __PREFS_DLG_H__
#include "prefs_dlg.h"
-#endif
-
#include "prefs.h"
#include "column.h"