diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-16 00:57:31 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-16 00:57:31 -0700 |
| commit | aefd87e148d11777492fc068f3eddf2945cfbfc5 (patch) | |
| tree | a3cfeef12ee2c00862aa4af229a83bb60f5176ef | |
| parent | bf501fb940ce8714da3a823f594e1f5e1a089597 (diff) | |
| download | emacs-aefd87e148d11777492fc068f3eddf2945cfbfc5.tar.gz | |
* xgselect.c (xgselect_initialize): Check vs interface
even if ! (defined (USE_GTK) || defined (HAVE_GCONF)).
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/xgselect.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ded04afa9ab..65c811e6e78 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2011-04-16 Paul Eggert <eggert@cs.ucla.edu> + * xgselect.c (xgselect_initialize): Check vs interface + even if ! (defined (USE_GTK) || defined (HAVE_GCONF)). + * xmenu.c (xmenu_show): Rename parm to avoid shadowing. * xterm.c (x_create_toolkit_scroll_bar): Use const * for pointers diff --git a/src/xgselect.c b/src/xgselect.c index 96d763ff088..0d154f6496a 100644 --- a/src/xgselect.c +++ b/src/xgselect.c @@ -19,11 +19,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> +#include <setjmp.h> +#include "xgselect.h" + #if defined (USE_GTK) || defined (HAVE_GCONF) + #include <glib.h> #include <errno.h> #include <setjmp.h> -#include "xgselect.h" static GPollFD *gfds; static int gfds_size; |