diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-08-29 19:05:41 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-08-29 19:05:41 +0000 |
| commit | 3f4397bbb054b20791c237afac01f431d8d20f04 (patch) | |
| tree | 0438f2db9c0e65b5e2189f4592f4834ee7fdc0cb /packet-dcerpc-reg.h | |
| parent | 79195136aaa365702c69a0ca1ab0cbe553a6bf44 (diff) | |
| download | wireshark-3f4397bbb054b20791c237afac01f431d8d20f04.tar.gz wireshark-3f4397bbb054b20791c237afac01f431d8d20f04.tar.bz2 wireshark-3f4397bbb054b20791c237afac01f431d8d20f04.zip | |
From Ulf Lamping: change some #define names to avoid name collisions on
Windows that cause compiler warnings.
svn path=/trunk/; revision=6129
Diffstat (limited to 'packet-dcerpc-reg.h')
| -rw-r--r-- | packet-dcerpc-reg.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/packet-dcerpc-reg.h b/packet-dcerpc-reg.h index 11a538d096..399bf156ea 100644 --- a/packet-dcerpc-reg.h +++ b/packet-dcerpc-reg.h @@ -2,7 +2,7 @@ * Routines for SMB \PIPE\winreg packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-reg.h,v 1.5 2002/08/28 21:00:10 jmayer Exp $ + * $Id: packet-dcerpc-reg.h,v 1.6 2002/08/29 19:05:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -54,22 +54,22 @@ #define _REG_UNK_17 0x17 #define REG_SHUTDOWN 0x18 #define REG_ABORT_SHUTDOWN 0x19 -#define REG_UNK_1A 0x1a +#define _REG_UNK_1A 0x1a /* Registry data types */ -#define REG_NONE 0 -#define REG_SZ 1 -#define REG_EXPAND_SZ 2 -#define REG_BINARY 3 -#define REG_DWORD 4 -#define REG_DWORD_LE 4 /* DWORD, little endian */ -#define REG_DWORD_BE 5 /* DWORD, big endian */ -#define REG_LINK 6 -#define REG_MULTI_SZ 7 -#define REG_RESOURCE_LIST 8 -#define REG_FULL_RESOURCE_DESCRIPTOR 9 -#define REG_RESOURCE_REQUIREMENTS_LIST 10 +#define DCERPC_REG_NONE 0 +#define DCERPC_REG_SZ 1 +#define DCERPC_REG_EXPAND_SZ 2 +#define DCERPC_REG_BINARY 3 +#define DCERPC_REG_DWORD 4 +#define DCERPC_REG_DWORD_LE 4 /* DWORD, little endian */ +#define DCERPC_REG_DWORD_BE 5 /* DWORD, big endian */ +#define DCERPC_REG_LINK 6 +#define DCERPC_REG_MULTI_SZ 7 +#define DCERPC_REG_RESOURCE_LIST 8 +#define DCERPC_REG_FULL_RESOURCE_DESCRIPTOR 9 +#define DCERPC_REG_RESOURCE_REQUIREMENTS_LIST 10 extern const value_string reg_datatypes[]; |