diff options
| author | Daniel Colascione <dancol@dancol.org> | 2013-03-13 11:28:50 -0800 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2013-03-13 11:28:50 -0800 |
| commit | 3fc5e44aaaac666b7f6a77b2e2fcc0c6646659d5 (patch) | |
| tree | 61b8e2d873d3d20d30fa2659304b3ec05e520841 | |
| parent | 1c4a85eda018224ac258d8b55cad5093015f1f77 (diff) | |
* emacs.c (main): Call syms_of_cygw32 on CYGWIN non-NTGUI builds
too so that these builds can use Cygwin's file conversion
functions. (We've been building and linking cygw32.o all along
and just not using it.)
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/emacs.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d328d0a74c..8f379e25b4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2013-03-13 Daniel Colascione <dancol@dancol.org> + + * emacs.c (main): Call syms_of_cygw32 on CYGWIN non-NTGUI builds + too so that these builds can use Cygwin's file conversion + functions. (We've been building and linking cygw32.o all along + and just not using it.) + 2013-03-13 Paul Eggert <eggert@cs.ucla.edu> File synchronization fixes (Bug#13944). diff --git a/src/emacs.c b/src/emacs.c index b96076b134..bd33583af0 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 @@ -1348,7 +1348,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 (); |