* 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.)

diff --git a/src/ChangeLog b/src/ChangeLog
index d328d0a74cacb50b44d8908b2804f0077b5e5ea2..8f379e25b49ca47f7670c5fd7dfa5040c9aff11a 100644 (file)
--- 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 b96076b1340ce5b61793bf727e644a1785d4c158..bd33583af0c1aba8a447ee8ce5adc292b862f75d 100644 (file)
--- 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 ();