Index: plugins/loaders/cdx/cdx.cc
===================================================================
--- plugins/loaders/cdx/cdx.cc	(révision 866)
+++ plugins/loaders/cdx/cdx.cc	(copie de travail)
@@ -56,11 +56,11 @@
 #else
 char *buffer[4];
 #define READINT16(input,i) \
-	bool res = gsf_input_read (input, 2, (guint8*) buffer), \
-	(guint16) i = buffer[0] + buffer[1] << 8, res
-#define READINT32(input,buf,i) \
-	bool res = gsf_input_read (input, 4, (guint8*) buffer), \
-	(guint32) i = buffer[0] + buffer[1] << 8 + buffer[2] << 16 + buffer[3] << 24, res
+	( bool res = gsf_input_read (input, 2, (guint8*) buffer), \
+	(guint16) i = buffer[0] + buffer[1] << 8, res )
+#define READINT32(input,i) \
+	( bool res = gsf_input_read (input, 4, (guint8*) buffer), \
+	(guint32) i = buffer[0] + buffer[1] << 8 + buffer[2] << 16 + buffer[3] << 24, res )
 #endif
 
 typedef struct {
@@ -79,13 +79,15 @@
 	case 1:
 		gsf_input_read (input, 1, (guint8*) &res);
 		break;
-	case 2:
+	case 2: {
 		READINT16 (input, res);
 		break;
-	case 4:
+	}
+	case 4: {
 		READINT32 (input, res);
 		break;
 	}
+	}
 	return res;
 }