Commit e0d72e3d authored by Guillaume Poirier's avatar Guillaume Poirier

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

Fix define of illegal identifier (as defined in section "7.1.3 Reserved identiers" of C99 spec) "__UNUSED__", and use the one defined in common/osdep.h, i.e. "UNUSED"
based on a patch by Diego Biurrun
parent a146ee3d
......@@ -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;
......
......@@ -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];
......
......@@ -2,7 +2,7 @@
#define X264_GTK_ENCODE_PRIVATE_H
#define __UNUSED__ __attribute__((unused))
#include <common/osdep.h>
#include "x264_gtk_demuxers.h"
......
......@@ -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);
......
......@@ -2,7 +2,7 @@
#define X264_GTK_PRIVATE_H
#define __UNUSED__ __attribute__((unused))
#include <common/osdep.h>
typedef struct Bitrate_ Bitrate;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment