5 files changed, 4 insertions, 13 deletions
diff --git a/src/surface/linux.c b/src/surface/linux.c
index b5bf8ad..69a6a97 100644
--- a/src/surface/linux.c
+++ b/src/surface/linux.c
@@ -32,9 +32,6 @@
 #include "cursor.h"
 
 
-
-#define UNUSED(x) ((x) = (x))
-
 #define FB_NAME "/dev/fb0"
 
 struct lnx_priv {
diff --git a/src/surface/ram.c b/src/surface/ram.c
index 4deabda..e2cfa04 100644
--- a/src/surface/ram.c
+++ b/src/surface/ram.c
@@ -18,8 +18,6 @@
 #include "surface.h"
 #include "plot.h"
 
-#define UNUSED(x) ((x) = (x))
-
 static int ram_defaults(nsfb_t *nsfb)
 {
     nsfb->width = 0;
diff --git a/src/surface/sdl.c b/src/surface/sdl.c
index 48052a8..8d2930e 100644
--- a/src/surface/sdl.c
+++ b/src/surface/sdl.c
@@ -502,7 +502,7 @@ static int sdl_initialise(nsfb_t *nsfb)
 
 static int sdl_finalise(nsfb_t *nsfb)
 {
-    nsfb=nsfb;
+    UNUSED(nsfb);
     SDL_Quit();
     return 0;
 }
@@ -510,8 +510,8 @@ static int sdl_finalise(nsfb_t *nsfb)
 static uint32_t wakeeventtimer(uint32_t ival, void *param)
 {
     SDL_Event event;
-    ival = ival;
-    param = param;
+    UNUSED(ival);
+    UNUSED(param);
 
     event.type = SDL_USEREVENT;
     event.user.code = 0;
@@ -528,7 +528,7 @@ static bool sdl_input(nsfb_t *nsfb, nsfb_event_t *event, int timeout)
     int got_event;
     SDL_Event sdlevent;
 
-    nsfb = nsfb; /* unused */
+    UNUSED(nsfb);
 
     if (timeout == 0) {
         got_event = SDL_PollEvent(&sdlevent);
diff --git a/src/surface/surface.c b/src/surface/surface.c
index f3127bd..c728bad 100644
--- a/src/surface/surface.c
+++ b/src/surface/surface.c
@@ -17,8 +17,6 @@
 
 #define MAX_SURFACES 16
 
-#define UNUSED(x) ((x) = (x))
-
 struct nsfb_surface_s {
     enum nsfb_type_e type;
     const nsfb_surface_rtns_t *rtns;
diff --git a/src/surface/vnc.c b/src/surface/vnc.c
index ca9455b..a09a8a2 100644
--- a/src/surface/vnc.c
+++ b/src/surface/vnc.c
@@ -21,8 +21,6 @@
 #include "plot.h"
 #include "cursor.h"
 
-#define UNUSED(x) ((x) = (x))
-
 static nsfb_event_t *gevent;
 
 /* vnc special set codes */