diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-10-09 20:28:06 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-10-09 20:28:06 +0200 |
| commit | b97f22cdad55a0964758cef3a19ce3fa1098657d (patch) | |
| tree | 8d078a5b2aab3f55708a5f8eeaf8ca0f022e6ee3 /src/emacs.c | |
| parent | 87c141ce9750881f6203148e3c49d00710cd472e (diff) | |
| parent | b15736e6e33a52021a2a91b0b3360cd5a9803405 (diff) | |
| download | emacs-b97f22cdad55a0964758cef3a19ce3fa1098657d.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/emacs.c b/src/emacs.c index 1d416984d2d..c84da7411ad 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -34,18 +34,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #ifdef WINDOWSNT #include <fcntl.h> #include "w32.h" -#endif - -#if defined (WINDOWSNT) #include "w32heap.h" #endif -#if defined (WINDOWSNT) || defined (HAVE_NTGUI) +#if defined WINDOWSNT || defined HAVE_NTGUI #include "w32select.h" #include "w32font.h" #endif -#if defined (HAVE_NTGUI) && defined (CYGWIN) +#if defined HAVE_NTGUI && defined CYGWIN #include "cygw32.h" #endif @@ -179,7 +176,7 @@ static uprintmax_t heap_bss_diff; We mark being in the exec'd process by a daemon name argument of form "--daemon=\nFD0,FD1\nNAME" where FD are the pipe file descriptors, NAME is the original daemon name, if any. */ -#if defined (NS_IMPL_COCOA) || (defined (HAVE_NTGUI) && defined (CYGWIN)) +#if defined NS_IMPL_COCOA || (defined HAVE_NTGUI && defined CYGWIN) # define DAEMON_MUST_EXEC #endif @@ -698,7 +695,7 @@ main (int argc, char **argv) char *dname_arg = 0; #ifdef DAEMON_MUST_EXEC char dname_arg2[80]; -#endif /* DAEMON_MUST_EXEC */ +#endif char *ch_to_dir; #if GC_MARK_STACK @@ -1378,9 +1375,9 @@ 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 && defined HAVE_NTGUI syms_of_cygw32 (); -#endif /* defined(CYGWIN) && defined (HAVE_NTGUI) */ +#endif syms_of_window (); syms_of_xdisp (); syms_of_font (); @@ -1415,9 +1412,9 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem syms_of_fontset (); #endif /* HAVE_NTGUI */ -#if defined (WINDOWSNT) || defined (HAVE_NTGUI) +#if defined WINDOWSNT || defined HAVE_NTGUI syms_of_w32select (); -#endif /* WINDOWSNT || HAVE_NTGUI */ +#endif #ifdef MSDOS syms_of_xmenu (); @@ -1466,10 +1463,9 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem globals_of_w32menu (); #endif /* HAVE_NTGUI */ -#if defined (WINDOWSNT) || defined (HAVE_NTGUI) +#if defined WINDOWSNT || defined HAVE_NTGUI globals_of_w32select (); -#endif /* WINDOWSNT || HAVE_NTGUI */ - +#endif } init_charset (); |