From 9518d53ab4e7c3bb8a41077660bbe4e800ffd2b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=BCxen?= <tuexen@fh-muenster.de>
Date: Fri, 3 Jul 2009 10:29:45 +0000
Subject: [PATCH] Make the compiler on Mac OS X happy...

svn path=/trunk/; revision=28934
---
 plugins/profinet/packet-dcerpc-pn-io.c | 14 +++++++-------
 plugins/profinet/packet-pn-rt.c        | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index c22868d1ba..3e88018e87 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -5356,7 +5356,7 @@ dissect_SubFrameBlock_block(tvbuff_t *tvb, int offset,
 static int
 dissect_IRTFrameBlock_block(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, proto_item *item, guint8 *drep, guint8 u8BlockVersionHigh, guint8 u8BlockVersionLow,
-	guint16 u16BodyLength)
+	guint16 u16BodyLength _U_)
 {
     guint16 u16IOCRReference;
     guint8 u8IOCRTxPortsRedundantPort;
@@ -6834,8 +6834,8 @@ dissect_PNIO_heur(tvbuff_t *tvb,
 
     /* is this a (none DFP) PNIO class 3 data packet? */
 	/* frame id must be in valid range (cyclic Real-Time, class=3) */
-	if (u16FrameID >= 0x0100 && u16FrameID <= 0x04ff || /* non redundant */
-		u16FrameID >= 0x0800 && u16FrameID <= 0x0fff) { /* redundant */
+	if ((u16FrameID >= 0x0100 && u16FrameID <= 0x04ff) || /* non redundant */
+	    (u16FrameID >= 0x0800 && u16FrameID <= 0x0fff)) { /* redundant */
         dissect_PNIO_C_SDU(tvb, 0, pinfo, tree, drep);
         return TRUE;
     }
@@ -6844,10 +6844,10 @@ dissect_PNIO_heur(tvbuff_t *tvb,
 	/* frame id must be in valid range (cyclic Real-Time, class=2) and
      * first byte (CBA version field) has to be != 0x11 */
 	if ((
-		u16FrameID >= 0x5000 && u16FrameID <= 0x57ff || /* redundant */
-		u16FrameID >= 0x6000 && u16FrameID <= 0x67ff || /* non redundant */
-		u16FrameID >= 0x7000 && u16FrameID <= 0x77ff || /* redundant */
-		u16FrameID >= 0x8000 && u16FrameID <= 0xbfff)   /* non redundant */
+		(u16FrameID >= 0x5000 && u16FrameID <= 0x57ff) || /* redundant */
+		(u16FrameID >= 0x6000 && u16FrameID <= 0x67ff) || /* non redundant */
+		(u16FrameID >= 0x7000 && u16FrameID <= 0x77ff) || /* redundant */
+		(u16FrameID >= 0x8000 && u16FrameID <= 0xbfff))   /* non redundant */
 		&& u8CBAVersion != 0x11) {
         dissect_PNIO_C_SDU(tvb, 0, pinfo, tree, drep);
         return TRUE;
diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c
index 824bd4691e..b39ffd1b8e 100644
--- a/plugins/profinet/packet-pn-rt.c
+++ b/plugins/profinet/packet-pn-rt.c
@@ -176,12 +176,12 @@ dissect_CSF_SDU_heur(tvbuff_t *tvb,
     u16FrameID = GPOINTER_TO_UINT(pinfo->private_data);
 
 	/* possible FrameID ranges for DFP */
-	if (u16FrameID >= 0x0500 && u16FrameID < 0x05ff ||
-		u16FrameID >= 0x0600 && u16FrameID < 0x07ff ||
-		u16FrameID >= 0x4800 && u16FrameID < 0x4fff ||
-		u16FrameID >= 0x5800 && u16FrameID < 0x5fff ||
-		u16FrameID >= 0x6800 && u16FrameID < 0x6fff ||
-		u16FrameID >= 0x7800 && u16FrameID < 0x7fff ) {
+	if ((u16FrameID >= 0x0500 && u16FrameID < 0x05ff) ||
+	    (u16FrameID >= 0x0600 && u16FrameID < 0x07ff) ||
+	    (u16FrameID >= 0x4800 && u16FrameID < 0x4fff) ||
+	    (u16FrameID >= 0x5800 && u16FrameID < 0x5fff) ||
+	    (u16FrameID >= 0x6800 && u16FrameID < 0x6fff) ||
+	    (u16FrameID >= 0x7800 && u16FrameID < 0x7fff)) {
 		/* can't check this CRC, as the checked data bytes are not available */
 		u16SFCRC16 = tvb_get_letohs(tvb, offset);
 		proto_tree_add_uint(tree, hf_pn_rt_sf_crc16, tvb, offset, 2, u16SFCRC16);