diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-03-17 05:17:24 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 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 | |
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/>. */ #include "w32common.h" #endif -#if defined HAVE_NTGUI && defined CYGWIN +#if defined CYGWIN #include "cygw32.h" #endif @@ -1339,7 +1339,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem #ifdef WINDOWSNT syms_of_ntproc (); #endif /* WINDOWSNT */ -#if defined CYGWIN && defined HAVE_NTGUI +#if defined CYGWIN syms_of_cygw32 (); #endif syms_of_window (); |