diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-10-09 20:52:57 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-10-09 20:52:57 +0000 |
| commit | 33d2ce9a745bba94a4dc2d441ade54d490c2ca37 (patch) | |
| tree | e46771a4a4404405620014ac6931c3984185ca3e /packet-per.h | |
| parent | 23f4abb9f9732e78a97bd0bcef7846bd8f2a81f7 (diff) | |
Prefix OPTIONAL and NOT_OPTIONAL with ASN1_, to avoid collisions with
other definitions of OPTIONAL (such as the one in Windows).
svn path=/trunk/; revision=8650
Diffstat (limited to 'packet-per.h')
| -rw-r--r-- | packet-per.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-per.h b/packet-per.h index 9dcc2e1051..d81f1a9b68 100644 --- a/packet-per.h +++ b/packet-per.h @@ -2,7 +2,7 @@ * Routines for dissection of ASN.1 Aligned PER * 2003 Ronnie Sahlberg * - * $Id: packet-per.h,v 1.9 2003/08/23 07:31:02 guy Exp $ + * $Id: packet-per.h,v 1.10 2003/10/09 20:52:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -37,8 +37,8 @@ fprintf(stderr,"Not decoded yet in packet : %d [%s]\n", pinfo->fd->num,x); #define NOT_EXTENSION_ROOT 2 /* value for optional */ -#define NOT_OPTIONAL 0 -#define OPTIONAL 1 +#define ASN1_NOT_OPTIONAL 0 +#define ASN1_OPTIONAL 1 typedef struct _per_choice_t { int value; |