Skip to contentSkip to conversation

baycom_epp.c: Fix compilation with gcc-4.1.0-20050522

PATCH In review Alexey Dobriyan 2 participants 2 messages May 27, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 baycom_epp.c: Fix compilation with gcc-4.1.0-20050522

drivers/net/hamradio/baycom_epp.c:432: error: jump into statement expression

	...
drivers/net/hamradio/baycom_epp.c +4 -12
@@ -380,22 +380,18 @@ static inline void do_kiss_params(struct
  */
 
 #define ENCODEITERA(j)                         \
-({                                             \
         if (!(notbitstream & (0x1f0 << j)))    \
                 goto stuff##j;                 \
-  encodeend##j:    	;                      \
-})
+  encodeend##j:    	;
 
 #define ENCODEITERB(j)                                          \
-({                                                              \
   stuff##j:                                                     \
         bitstream &= ~(0x100 << j);                             \
         bitbuf = (bitbuf & (((2 << j) << numbit) - 1)) |        \
                 ((bitbuf & ~(((2 << j) << numbit) - 1)) << 1);  \
         numbit++;                                               \
         notbitstream = ~bitstream;                              \
-        goto encodeend##j;                                      \
-})
+        goto encodeend##j;
 
 
 static void encode_hdlc(struct baycom_state *bc)
@@ -611,16 +607,13 @@ static void do_rxpacket(struct net_devic
 }
 
 #define DECODEITERA(j)                                                        \
-({                                                                            \
         if (!(notbitstream & (0x0fc << j)))              /* flag or abort */  \
                 goto flgabrt##j;                                              \
         if ((bitstream & (0x1f8 << j)) == (0xf8 << j))   /* stuffed bit */    \
                 goto stuff##j;                                                \
-  enditer##j:      ;                                                           \
-})
+  enditer##j:      ;
 
 #define DECODEITERB(j)                                                                 \
-({                                                                                     \
   flgabrt##j:                                                                          \
         if (!(notbitstream & (0x1fc << j))) {              /* abort received */        \
                 state = 0;                                                             \
@@ -638,8 +631,7 @@ static void do_rxpacket(struct net_devic
   stuff##j:                                                                            \
         numbits--;                                                                     \
         bitbuf = (bitbuf & ((~0xff) << j)) | ((bitbuf & ~((~0xff) << j)) << 1);        \
-        goto enditer##j;                                                               \
-})
+        goto enditer##j;
         
 static int receive(struct net_device *dev, int cnt)
 {
#1 lore raw
Quoted 8 lines · On Fri, 27 May 2005 18:08:31 +0400 Alexey Dobriyan <[email protected]> wrote:

drivers/net/hamradio/baycom_epp.c:432: error: jump into statement expression

	...

drivers/net/hamradio/baycom_epp.c static inline void do_kiss_params(struct · line 385

Quoted 9 lines
drivers/net/hamradio/baycom_epp.c +1 -3
@@ -380,22 +380,18 @@ static inline void do_kiss_params(struct
  */
 
 #define ENCODEITERA(j)                         \
-({                                             \
         if (!(notbitstream & (0x1f0 << j)))    \
                 goto stuff##j;                 \
-  encodeend##j:    	;                      \
-})
+  encodeend##j:    	;

Ick... Please just kill this kind of macro crap