diff options
| author | Jan Djärv | 2013-06-18 20:41:48 +0200 |
|---|---|---|
| committer | Jan Djärv | 2013-06-18 20:41:48 +0200 |
| commit | 69f60cdc2310c5e0f644b65d1965353330068c8c (patch) | |
| tree | bae156fdc2afcab294f40501ec484068c4ac76c6 /src/process.c | |
| parent | 0d6224d432dee9781baadc8a833826e42fe7acda (diff) | |
| download | emacs-69f60cdc2310c5e0f644b65d1965353330068c8c.tar.gz emacs-69f60cdc2310c5e0f644b65d1965353330068c8c.zip | |
* process.c: Include xgselect.h if HAVE_GLIB. Include glib.h
if HAVE_GLIB && ! WINDOWSNT.
Fixes: debbugs:14654
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index 0afd8b5d2ac..9ef01dae765 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -124,8 +124,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 124 | #include TERM_HEADER | 124 | #include TERM_HEADER |
| 125 | #endif /* HAVE_WINDOW_SYSTEM */ | 125 | #endif /* HAVE_WINDOW_SYSTEM */ |
| 126 | 126 | ||
| 127 | #if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS) | 127 | #ifdef HAVE_GLIB |
| 128 | #include "xgselect.h" | 128 | #include "xgselect.h" |
| 129 | #ifndef WINDOWSNT | ||
| 130 | #include <glib.h> | ||
| 131 | #endif | ||
| 129 | #endif | 132 | #endif |
| 130 | 133 | ||
| 131 | #ifdef WINDOWSNT | 134 | #ifdef WINDOWSNT |