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 /packet-pim.c | |
| 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 'packet-pim.c')
| -rw-r--r-- | packet-pim.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/packet-pim.c b/packet-pim.c index b377aef654..35c50b9cb9 100644 --- a/packet-pim.c +++ b/packet-pim.c @@ -2,7 +2,7 @@ * Routines for PIM disassembly * (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org> * - * $Id: packet-pim.c,v 1.15 2000/08/07 03:20:59 guy Exp $ + * $Id: packet-pim.c,v 1.16 2000/08/11 13:35:08 deniel Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -23,8 +23,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#include "config.h" + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -34,16 +36,12 @@ #include <netinet/in.h> #endif +#include <glib.h> + #ifdef NEED_SNPRINTF_H -# ifdef HAVE_STDARG_H -# include <stdarg.h> -# else -# include <varargs.h> -# endif # include "snprintf.h" #endif -#include <glib.h> #include "packet.h" #include "packet-ip.h" #include "packet-ipv6.h" |