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 /oui.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 'oui.h')
-rw-r--r-- | oui.h | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -2,7 +2,7 @@ * Definitions of OUIs * Gilbert Ramirez <gram@xiexie.org> * - * $Id: oui.h,v 1.6 2000/04/12 20:24:34 gram Exp $ + * $Id: oui.h,v 1.7 2000/08/11 13:34:18 deniel Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -24,6 +24,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __OUI_H__ +#define __OUI_H__ + #define OUI_ENCAP_ETHER 0x000000 /* encapsulated Ethernet */ #define OUI_CISCO 0x00000C /* Cisco (future use) */ #define OUI_CISCO_90 0x0000F8 /* Cisco (IOS 9.0 and above?) */ @@ -33,3 +36,5 @@ #define OUI_CABLE_BPDU 0x00E02F /* DOCSIS spanning tree BPDU */ extern const value_string oui_vals[]; + +#endif |