diff options
| author | Daniel Colascione | 2012-09-01 00:01:36 -0800 |
|---|---|---|
| committer | Daniel Colascione | 2012-09-01 00:01:36 -0800 |
| commit | 0a850e9a4eff07824bba57892bf27ce9767559bd (patch) | |
| tree | dcbd8a6f16651b0745cf43a7ca02b6fd9e5e6daf /src/process.c | |
| parent | 3d10e1343d65341d4d48633e0b561df86787c438 (diff) | |
| parent | 17a2cbbd76385d0be8a4b28974e64f4debf459c1 (diff) | |
| download | emacs-0a850e9a4eff07824bba57892bf27ce9767559bd.tar.gz emacs-0a850e9a4eff07824bba57892bf27ce9767559bd.zip | |
Merge from cygw32 branch
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/process.c b/src/process.c index fbe56ebcb54..bfac054c3c2 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -116,12 +116,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 116 | #include "gnutls.h" | 116 | #include "gnutls.h" |
| 117 | #endif | 117 | #endif |
| 118 | 118 | ||
| 119 | #ifdef HAVE_WINDOW_SYSTEM | ||
| 120 | #include TERM_HEADER | ||
| 121 | #endif /* HAVE_WINDOW_SYSTEM */ | ||
| 122 | |||
| 119 | #if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS) | 123 | #if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS) |
| 120 | #include "xgselect.h" | 124 | #include "xgselect.h" |
| 121 | #endif | 125 | #endif |
| 122 | #ifdef HAVE_NS | ||
| 123 | #include "nsterm.h" | ||
| 124 | #endif | ||
| 125 | 126 | ||
| 126 | /* Work around GCC 4.7.0 bug with strict overflow checking; see | 127 | /* Work around GCC 4.7.0 bug with strict overflow checking; see |
| 127 | <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52904>. | 128 | <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52904>. |