diff options
| author | Tom Tromey | 2013-03-17 05:17:24 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-03-17 05:17:24 -0600 |
| commit | 6bd488cd8d05aa3983ca55f70ee384732d8c0085 (patch) | |
| tree | 5645fc7b882638d6c0eb3f61fd55bde1a63fc190 /src/emacs.c | |
| parent | 71f91792e3013b397996905224f387da5cc539a9 (diff) | |
| parent | 9c44569ea2a18099307e0571d523d8637000a153 (diff) | |
| download | emacs-6bd488cd8d05aa3983ca55f70ee384732d8c0085.tar.gz emacs-6bd488cd8d05aa3983ca55f70ee384732d8c0085.zip | |
merge from trunk
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c index 7b6f147619b..148bb836927 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -44,7 +44,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 44 | #include "w32common.h" | 44 | #include "w32common.h" |
| 45 | #endif | 45 | #endif |
| 46 | 46 | ||
| 47 | #if defined HAVE_NTGUI && defined CYGWIN | 47 | #if defined CYGWIN |
| 48 | #include "cygw32.h" | 48 | #include "cygw32.h" |
| 49 | #endif | 49 | #endif |
| 50 | 50 | ||
| @@ -1339,7 +1339,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem | |||
| 1339 | #ifdef WINDOWSNT | 1339 | #ifdef WINDOWSNT |
| 1340 | syms_of_ntproc (); | 1340 | syms_of_ntproc (); |
| 1341 | #endif /* WINDOWSNT */ | 1341 | #endif /* WINDOWSNT */ |
| 1342 | #if defined CYGWIN && defined HAVE_NTGUI | 1342 | #if defined CYGWIN |
| 1343 | syms_of_cygw32 (); | 1343 | syms_of_cygw32 (); |
| 1344 | #endif | 1344 | #endif |
| 1345 | syms_of_window (); | 1345 | syms_of_window (); |