Fix define of illegal identifier (as defined in section "7.1.3 Reserved identiers...

based on a patch by Diego Biurrun

diff --git a/gtk/x264_gtk.c b/gtk/x264_gtk.c
index bf4d7c625dd5284efb66682c78b4f73c80b67985..8f95c24e7259ccad737206e99df42b95e509e379 100644 (file)
--- a/gtk/x264_gtk.c
+++ b/gtk/x264_gtk.c
@@ -330,7 +330,7 @@ x264_gtk_free (X264_Gtk *x264_gtk)
 /* Callbacks */
 
 static void
-_dialog_run (GtkDialog       *dialog __UNUSED__,
+_dialog_run (GtkDialog       *dialog UNUSED,
              gint             response,
              X264_Gui_Config *gconfig,
              X264_Gtk        *x264_gtk)
@@ -382,7 +382,7 @@ _dialog_run (GtkDialog       *dialog __UNUSED__,
 
 /* x264 config management */
 static void
-_default_load (GtkButton *button __UNUSED__, gpointer user_data)
+_default_load (GtkButton *button UNUSED, gpointer user_data)
 {
   gchar            buf[64];
   X264_Gui_Config *config;

diff --git a/gtk/x264_gtk_encode_main_window.c b/gtk/x264_gtk_encode_main_window.c
index dbf9efd47237dba883bb17b3a8bda62ffd781f71..d6141ba95de52d4d35f4aa8accc68f15ef787fdb 100644 (file)
--- a/gtk/x264_gtk_encode_main_window.c
+++ b/gtk/x264_gtk_encode_main_window.c
@@ -328,8 +328,8 @@ _encode_shutdown (X264_Gtk_Encode *encode)
 }
 
 static gboolean
-_delete_window_cb (GtkWidget *widget __UNUSED__,
-                   GdkEvent  *event __UNUSED__,
+_delete_window_cb (GtkWidget *widget UNUSED,
+                   GdkEvent  *event UNUSED,
                    gpointer   user_data)
 {
   gtk_main_quit ();
@@ -504,7 +504,7 @@ _dimension_entry_cb (GtkEditable *editable,
 }
 
 static void
-_configure_window_cb (GtkButton *button __UNUSED__,
+_configure_window_cb (GtkButton *button UNUSED,
                       gpointer   user_data)
 {
   GtkWidget *window;
@@ -693,8 +693,8 @@ _response_window_cb (GtkDialog *dialog,
 }
 
 static gboolean
-_fill_status_window (GIOChannel  *io __UNUSED__,
-                     GIOCondition condition __UNUSED__,
+_fill_status_window (GIOChannel  *io UNUSED,
+                     GIOCondition condition UNUSED,
                      gpointer     user_data)
 {
   gchar             str[128];

diff --git a/gtk/x264_gtk_encode_private.h b/gtk/x264_gtk_encode_private.h
index cebfc4ae2440f54a130b6782d6891428152daa87..47fc9f8819251405487af0e7424b06c52763bdc4 100644 (file)
--- a/gtk/x264_gtk_encode_private.h
+++ b/gtk/x264_gtk_encode_private.h
@@ -2,7 +2,7 @@
 #define X264_GTK_ENCODE_PRIVATE_H
 
 
-#define __UNUSED__ __attribute__((unused))
+#include <common/osdep.h>
 
 #include "x264_gtk_demuxers.h"
 

diff --git a/gtk/x264_gtk_encode_status_window.c b/gtk/x264_gtk_encode_status_window.c
index a8f7f6e6a2ec6133b23020c0e6d8553b479c8848..d7c7bbfa4822f76ce58fc5f0b554ddb102d25ee0 100644 (file)
--- a/gtk/x264_gtk_encode_status_window.c
+++ b/gtk/x264_gtk_encode_status_window.c
@@ -149,7 +149,7 @@ _thread_data_free (X264_Thread_Data *thread_data)
 
 static gboolean
 _delete_window_cb (GtkWidget *widget,
-                   GdkEvent  *event __UNUSED__,
+                   GdkEvent  *event UNUSED,
                    gpointer   user_data)
 {
   gtk_widget_destroy (widget);

diff --git a/gtk/x264_gtk_private.h b/gtk/x264_gtk_private.h
index 8b8f47539db6d34ecd46bb5bd75d9097c890ce1b..aa9d40edc7dc03cfec07bad2b68b8c06fbaf7892 100644 (file)
--- a/gtk/x264_gtk_private.h
+++ b/gtk/x264_gtk_private.h
@@ -2,7 +2,7 @@
 #define X264_GTK_PRIVATE_H
 
 
-#define __UNUSED__ __attribute__((unused))
+#include <common/osdep.h>
 
 
 typedef struct Bitrate_ Bitrate;