aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ansi_a.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2003-11-10 22:31:06 +0000
committerGuy Harris <guy@alum.mit.edu>2003-11-10 22:31:06 +0000
commit5eb8b8a2a00e3b136614c664e5d44b9c92caf41b (patch)
tree9ad679d96e3a80d00cbbe537dc9df91371b9ddad /packet-ansi_a.c
parentd2987f0b6f775398a6985e00b0ff160331340dff (diff)
From Albert Chin: <stdlib.h> on HP-UX 11.00 (and possibly 10.20 and
perhaps some versions of Digital/Tru64 UNIX) drags in <wait.h>, which drags in <sys/procset.h>, which defines P_SID in ways that cause this not to compile. Use P_MY_SID instead. svn path=/trunk/; revision=8931
Diffstat (limited to 'packet-ansi_a.c')
-rw-r--r--packet-ansi_a.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-ansi_a.c b/packet-ansi_a.c
index dac5a5771f..d51c0f135f 100644
--- a/packet-ansi_a.c
+++ b/packet-ansi_a.c
@@ -10,7 +10,7 @@
* 2000 Access Network Interfaces
* 3GPP2 A.S0001-1 TIA/EIA-2001
*
- * $Id: packet-ansi_a.c,v 1.7 2003/11/10 20:15:28 guy Exp $
+ * $Id: packet-ansi_a.c,v 1.8 2003/11/10 22:31:06 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -5939,7 +5939,7 @@ typedef enum
P_SO_LIST, /* Service Option List */
P_S_RED_INFO, /* Service Redirection Info */
P_SR_ID, /* Session Reference Identifier (SR_ID) */
- P_SID, /* SID */
+ P_MY_SID, /* SID (P_SID collides with something you get when you include <stdlib.h> on HP-UX and Tru64 UNIX) */
P_SIGNAL, /* Signal */
P_SCI, /* Slot Cycle Index */
P_SW_VER, /* Software Version */
@@ -7469,7 +7469,7 @@ bsmap_ho_command(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
ELEM_OPT_TLV(P_HO_POW_LEV, "");
- ELEM_OPT_TV(P_SID, "");
+ ELEM_OPT_TV(P_MY_SID, "");
ELEM_OPT_TLV(P_EXT_HO_DIR_PARAMS, "");