diff options
| author | LRN <lrn1986@gmail.com> | 2014-02-11 17:49:09 +0000 |
|---|---|---|
| committer | LRN <lrn1986@gmail.com> | 2014-02-11 17:49:09 +0000 |
| commit | fd4b0dfcdbd65cf69b5ce3d57eaf24ff05ed10f8 (patch) | |
| tree | 4fb943f2f33ea9b0fad4b92a197f880337615e3d | |
| parent | efa1590746b51c10c50cecdfddd2d7c64e1b6533 (diff) | |
| download | gnunet-gtk-fd4b0dfcdbd65cf69b5ce3d57eaf24ff05ed10f8.tar.gz gnunet-gtk-fd4b0dfcdbd65cf69b5ce3d57eaf24ff05ed10f8.zip | |
Harmonize HAVE_GTK_GTKX_H and GDK_WINDOWING_X11 a bit
Use HAVE_GTK_GTKX_H for including the header, in #if
Use GDK_WINDOWING_X11 for code, in #ifdef
| -rw-r--r-- | src/lib/eventloop.c | 2 | ||||
| -rw-r--r-- | src/main/gnunet-gtk.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c index d7182339..1d47f04f 100644 --- a/src/lib/eventloop.c +++ b/src/lib/eventloop.c | |||
| @@ -181,7 +181,7 @@ GtkWidget * | |||
| 181 | GNUNET_GTK_plug_me (const char *env_name, | 181 | GNUNET_GTK_plug_me (const char *env_name, |
| 182 | GtkWidget *main_window) | 182 | GtkWidget *main_window) |
| 183 | { | 183 | { |
| 184 | #if GDK_WINDOWING_X11 | 184 | #ifdef GDK_WINDOWING_X11 |
| 185 | const char *plugid; | 185 | const char *plugid; |
| 186 | GtkWidget *plug; | 186 | GtkWidget *plug; |
| 187 | GtkWidget *child; | 187 | GtkWidget *child; |
diff --git a/src/main/gnunet-gtk.c b/src/main/gnunet-gtk.c index cc6c3c48..4a1aca19 100644 --- a/src/main/gnunet-gtk.c +++ b/src/main/gnunet-gtk.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | * @brief Gtk user interface for GNUnet | 24 | * @brief Gtk user interface for GNUnet |
| 25 | */ | 25 | */ |
| 26 | #include "gnunet_gtk.h" | 26 | #include "gnunet_gtk.h" |
| 27 | #ifdef GDK_WINDOWING_X11 | 27 | #if HAVE_GTK_GTKX_H |
| 28 | #include <gtk/gtkx.h> | 28 | #include <gtk/gtkx.h> |
| 29 | #endif | 29 | #endif |
| 30 | 30 | ||