aboutsummaryrefslogtreecommitdiffstats
path: root/file.h
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 /file.h
parent6ad00fc256b351823138519e5a594b3f0f068319 (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 'file.h')
-rw-r--r--file.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/file.h b/file.h
index 19eb987a10..20f91b12f5 100644
--- a/file.h
+++ b/file.h
@@ -1,7 +1,7 @@
/* file.h
* Definitions for file structures and routines
*
- * $Id: file.h,v 1.74 2000/08/09 06:18:16 gram Exp $
+ * $Id: file.h,v 1.75 2000/08/11 13:34:30 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -30,27 +30,15 @@
#include <sys/types.h>
#endif
-#ifndef __WTAP_H__
#include "wiretap/wtap.h"
-#endif
#ifdef HAVE_LIBPCAP
-#ifndef lib_pcap_h
#include <pcap.h>
#endif
-#endif
-#ifndef __DFILTER_H__
#include "dfilter.h"
-#endif
-
-#ifndef __COLORS_H__
#include "gtk/colors.h" /* XXX */
-#endif
-
-#ifndef __PRINT_H__
#include "print.h"
-#endif
#include <errno.h>