Fix unsafe defines.

edit/editcmd.c

@@ -1147,9 +1147,9 @@ int edit_block_delete_cmd (WEdit * edit)
 #define REPLACE_DLG_HEIGHT 15
 #define CONFIRM_DLG_WIDTH 79
 #define CONFIRM_DLG_HEIGTH 6
-#define B_REPLACE_ALL B_USER+1
-#define B_REPLACE_ONE B_USER+2
-#define B_SKIP_REPLACE B_USER+3
+#define B_REPLACE_ALL (B_USER+1)
+#define B_REPLACE_ONE (B_USER+2)
+#define B_SKIP_REPLACE (B_USER+3)
 
 static int
 edit_replace_prompt (WEdit * edit, char *replace_text, int xpos, int ypos)

src/achown.c

@@ -52,13 +52,13 @@
 #define BUTTONS		9
 
 #define B_SETALL        B_USER
-#define B_SKIP          B_USER + 1
+#define B_SKIP          (B_USER + 1)
 
-#define B_OWN           B_USER + 3
-#define B_GRP           B_USER + 4
-#define B_OTH           B_USER + 5
-#define B_OUSER         B_USER + 6
-#define B_OGROUP        B_USER + 7
+#define B_OWN           (B_USER + 3)
+#define B_GRP           (B_USER + 4)
+#define B_OTH           (B_USER + 5)
+#define B_OUSER         (B_USER + 6)
+#define B_OGROUP        (B_USER + 7)
 
 static struct Dlg_head *ch_dlg;
 

src/boxes.c

@@ -855,9 +855,9 @@ symlink_dialog (char *existing, char *new, char **ret_existing, char **ret_new)
 }
 
 #ifdef WITH_BACKGROUND
-#define B_STOP   B_USER+1
-#define B_RESUME B_USER+2
-#define B_KILL   B_USER+3
+#define B_STOP   (B_USER+1)
+#define B_RESUME (B_USER+2)
+#define B_KILL   (B_USER+3)
 
 static int JOBS_X = 60;
 #define JOBS_Y 15

src/chmod.c

@@ -56,9 +56,9 @@ static int single_set;
 #define BUTTONS		6
 
 #define B_MARKED	B_USER
-#define B_ALL		B_USER+1
-#define B_SETMRK        B_USER+2
-#define B_CLRMRK        B_USER+3
+#define B_ALL		(B_USER+1)
+#define B_SETMRK        (B_USER+2)
+#define B_CLRMRK        (B_USER+3)
 
 static int mode_change, need_update;
 static int c_file, end_chmod;

src/chown.c

@@ -59,8 +59,8 @@
 #define BUTTONS		5
 
 #define B_SETALL        B_USER
-#define B_SETUSR        B_USER + 1
-#define B_SETGRP        B_USER + 2
+#define B_SETUSR        (B_USER + 1)
+#define B_SETGRP        (B_USER + 2)
 
 static int need_update, end_chown;
 static int current_file;

src/find.c

@@ -50,10 +50,10 @@
 static int FIND_X = 50;
 
 /* Size of the find window */
-#define FIND2_Y LINES-4
+#define FIND2_Y (LINES - 4)
 
 static int FIND2_X = 64;
-#define FIND2_X_USE FIND2_X-20
+#define FIND2_X_USE (FIND2_X - 20)
 
 /* A couple of extra messages we need */
 enum {

src/hotlist.c

@@ -55,7 +55,7 @@
 #define UY		2
 
 #define BX		UX
-#define BY		LINES-6
+#define BY		(LINES - 6)
 
 #define BUTTONS		(sizeof(hotlist_but)/sizeof(struct _hotlist_but))
 #define LABELS          3

src/layout.c

@@ -142,9 +142,9 @@ static int height;
 #define BY      12
 
 #define B_2LEFT B_USER
-#define B_2RIGHT B_USER + 1
-#define B_PLUS B_USER + 2
-#define B_MINUS B_USER + 3
+#define B_2RIGHT (B_USER + 1)
+#define B_PLUS (B_USER + 2)
+#define B_MINUS (B_USER + 3)
 
 static Dlg_head *layout_dlg;
 

src/listmode.c

@@ -54,7 +54,7 @@
 #define BY		18
 
 #define B_ADD		B_USER
-#define B_REMOVE        B_USER + 1
+#define B_REMOVE        (B_USER + 1)
 
 static WListbox *l_listmode;
 
@@ -80,7 +80,7 @@ struct listmode_button {
 };
 
 #define B_PLUS B_USER
-#define B_MINUS B_USER+1
+#define B_MINUS (B_USER+1)
 
 struct listmode_label {
     int y, x;

src/main.h

@@ -15,7 +15,7 @@ enum {
 #define UP_RELOAD   1
 #define UP_ONLY_CURRENT  2
 
-#define UP_KEEPSEL (char *) -1
+#define UP_KEEPSEL ((char *) -1)
 
 extern int quote;
 extern volatile int quit;

src/myslang.h

@@ -18,7 +18,7 @@ enum {
     KEY_ENTER, KEY_DC, KEY_SCANCEL, KEY_BTAB
 };
 
-#define KEY_F(x) 1000+x
+#define KEY_F(x) (1000+x)
 
 #define ACS_VLINE SLSMG_VLINE_CHAR
 #define ACS_HLINE SLSMG_HLINE_CHAR

src/panelize.c

@@ -55,7 +55,7 @@
 #define BUTTONS		4
 #define LABELS          3
 #define B_ADD		B_USER
-#define B_REMOVE        B_USER + 1
+#define B_REMOVE        (B_USER + 1)
 
 static WListbox *l_panelize;
 static Dlg_head *panelize_dlg;