diff options
-rw-r--r-- | globals.h | 20 | ||||
-rw-r--r-- | packet-atalk.c | 8 | ||||
-rw-r--r-- | packet-snmp.c | 6 | ||||
-rw-r--r-- | proto.c | 6 | ||||
-rw-r--r-- | proto.h | 10 | ||||
-rw-r--r-- | wiretap/buffer.h | 10 |
6 files changed, 30 insertions, 30 deletions
@@ -1,7 +1,7 @@ /* globals.h * Global defines, etc. * - * $Id: globals.h,v 1.3 1999/09/10 07:19:40 guy Exp $ + * $Id: globals.h,v 1.4 1999/09/12 14:34:18 deniel Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -60,22 +60,22 @@ /* Byte ordering */ #ifndef BYTE_ORDER - #define LITTLE_ENDIAN 4321 - #define BIG_ENDIAN 1234 - #ifdef WORDS_BIGENDIAN - #define BYTE_ORDER BIG_ENDIAN - #else - #define BYTE_ORDER LITTLE_ENDIAN - #endif +# define LITTLE_ENDIAN 4321 +# define BIG_ENDIAN 1234 +# ifdef WORDS_BIGENDIAN +# define BYTE_ORDER BIG_ENDIAN +# else +# define BYTE_ORDER LITTLE_ENDIAN +# endif #endif /* From the K&R book, p. 89 */ #ifndef MAX - #define MAX(x, y) ((x) > (y) ? (x) : (y)) +# define MAX(x, y) ((x) > (y) ? (x) : (y)) #endif #ifndef MIN - #define MIN(x, y) ((x) < (y) ? (x) : (y)) +# define MIN(x, y) ((x) < (y) ? (x) : (y)) #endif extern FILE *data_out_file; diff --git a/packet-atalk.c b/packet-atalk.c index 3e1237f3fd..61380d5157 100644 --- a/packet-atalk.c +++ b/packet-atalk.c @@ -39,12 +39,12 @@ static int proto_ddp = -1; /* P = Padding, H = Hops, L = Len */ #if BYTE_ORDER == BIG_ENDIAN /* PPHHHHLL LLLLLLLL */ - #define ddp_hops(x) ( ( x >> 10) & 0x3C ) - #define ddp_len(x) ( x & 0x03ff ) +# define ddp_hops(x) ( ( x >> 10) & 0x3C ) +# define ddp_len(x) ( x & 0x03ff ) #else /* LLLLLLLL PPHHHHLL*/ - #define ddp_hops(x) ( x & 0x3C ) - #define ddp_len(x) ( ntohs(x) & 0x03ff ) +# define ddp_hops(x) ( x & 0x3C ) +# define ddp_len(x) ( ntohs(x) & 0x03ff ) #endif typedef struct _e_ddp { guint16 hops_len; /* combines pad, hops, and len */ diff --git a/packet-snmp.c b/packet-snmp.c index 4c3729584b..068704e456 100644 --- a/packet-snmp.c +++ b/packet-snmp.c @@ -2,7 +2,7 @@ * Routines for SNMP (simple network management protocol) * D.Jorand (c) 1998 * - * $Id: packet-snmp.c,v 1.8 1999/08/29 04:15:31 gram Exp $ + * $Id: packet-snmp.c,v 1.9 1999/09/12 14:34:18 deniel Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -30,9 +30,9 @@ #if defined(HAVE_UCD_SNMP_SNMP_H) - #define WITH_SNMP_UCD 1 +# define WITH_SNMP_UCD 1 #elif defined(HAVE_SNMP_SNMP_H) - #define WITH_SNMP_CMU 1 +# define WITH_SNMP_CMU 1 #endif #if defined(WITH_SNMP_CMU) || defined(WITH_SNMP_UCD) @@ -1,7 +1,7 @@ /* proto.c * Routines for protocol tree * - * $Id: proto.c,v 1.24 1999/09/12 06:11:37 guy Exp $ + * $Id: proto.c,v 1.25 1999/09/12 14:34:19 deniel Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -64,9 +64,9 @@ #define cVALS(x) (const value_string*)(x) #if defined(HAVE_UCD_SNMP_SNMP_H) - #define WITH_SNMP_UCD 1 +# define WITH_SNMP_UCD 1 #elif defined(HAVE_SNMP_SNMP_H) - #define WITH_SNMP_CMU 1 +# define WITH_SNMP_CMU 1 #endif static gboolean @@ -1,7 +1,7 @@ /* proto.h * Definitions for protocol display * - * $Id: proto.h,v 1.10 1999/09/12 06:11:38 guy Exp $ + * $Id: proto.h,v 1.11 1999/09/12 14:34:20 deniel Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -28,13 +28,13 @@ #define __PROTO_H__ #ifdef HAVE_SYS_TIME_H - #ifndef _SYS_TIME_H - #include <sys/time.h> - #endif +# ifndef _SYS_TIME_H +# include <sys/time.h> +# endif #endif #ifdef HAVE_WINSOCK_H -#include <winsock.h> +# include <winsock.h> #endif /* needs glib.h */ diff --git a/wiretap/buffer.h b/wiretap/buffer.h index 83300736e6..7b72e7ea94 100644 --- a/wiretap/buffer.h +++ b/wiretap/buffer.h @@ -1,6 +1,6 @@ /* buffer.h * - * $Id: buffer.h,v 1.2 1998/11/12 06:01:19 gram Exp $ + * $Id: buffer.h,v 1.3 1999/09/12 14:34:36 deniel Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu> @@ -39,10 +39,10 @@ void buffer_append(Buffer* buffer, char *from, unsigned int bytes); void buffer_remove_start(Buffer* buffer, unsigned int bytes); #ifdef SOME_FUNCTIONS_ARE_DEFINES - #define buffer_increase_length(buffer,bytes) (buffer)->first_free += (bytes) - #define buffer_length(buffer) ((buffer)->first_free - (buffer)->start) - #define buffer_start_ptr(buffer) ((buffer)->data + (buffer)->start) - #define buffer_end_ptr(buffer) ((buffer)->data + (buffer)->first_free) +# define buffer_increase_length(buffer,bytes) (buffer)->first_free += (bytes) +# define buffer_length(buffer) ((buffer)->first_free - (buffer)->start) +# define buffer_start_ptr(buffer) ((buffer)->data + (buffer)->start) +# define buffer_end_ptr(buffer) ((buffer)->data + (buffer)->first_free) #else void buffer_increase_length(Buffer* buffer, unsigned int bytes); unsigned int buffer_length(Buffer* buffer); |