[Emacs-diffs] /srv/bzr/emacs/trunk r110806: Fix bug #12805 with compilation error in the cygw32 build.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110806
fixes bug: http://debbugs.gnu.org/12805
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2012-11-05 18:30:45 +0200
message:
  Fix bug #12805 with compilation error in the cygw32 build.
  
   src/makefile.w32-in ($(BLD)/w32fns.$(O)): Depend on $(NT_INC)/unistd.h.
   src/w32fns.c Include unistd.h, to avoid compiler warnings on Cygwin.
   (emacs_abort) [CYGWIN]: Don't call _open_osfhandle; instead, use
   file descriptor 2 for standard error.
modified:
  src/ChangeLog
  src/makefile.w32-in
  src/w32fns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-11-05 04:00:58 +0000
+++ b/src/ChangeLog     2012-11-05 16:30:45 +0000
@@ -1,3 +1,11 @@
+2012-11-05  Eli Zaretskii  <address@hidden>
+
+       * makefile.w32-in ($(BLD)/w32fns.$(O)): Depend on $(NT_INC)/unistd.h.
+
+       * w32fns.c Include unistd.h, to avoid compiler warnings on Cygwin.
+       (emacs_abort) [CYGWIN]: Don't call _open_osfhandle; instead, use
+       file descriptor 2 for standard error.
+
 2012-11-05  Chong Yidong  <address@hidden>
 
        * process.c (wait_reading_process_output): Revert previous change.

=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in       2012-10-17 19:02:44 +0000
+++ b/src/makefile.w32-in       2012-11-05 16:30:45 +0000
@@ -1564,6 +1564,7 @@
        $(SRC)/w32.h \
        $(SRC)/w32common.h \
        $(SRC)/w32heap.h \
+       $(NT_INC)/unistd.h \
        $(BUFFER_H) \
        $(CCL_H) \
        $(CHARACTER_H) \

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2012-11-03 05:59:17 +0000
+++ b/src/w32fns.c      2012-11-05 16:30:45 +0000
@@ -27,6 +27,7 @@
 #include <errno.h>
 #include <math.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #include "lisp.h"
 #include "w32term.h"
@@ -7749,12 +7750,19 @@
 
        if (i)
          {
+#ifdef CYGWIN
+           int stderr_fd = 2;
+#else
            HANDLE errout = GetStdHandle (STD_ERROR_HANDLE);
-           int stderr_fd = -1, errfile_fd = -1;
+           int stderr_fd = -1;
+#endif
+           int errfile_fd = -1;
            int j;
 
+#ifndef CYGWIN
            if (errout && errout != INVALID_HANDLE_VALUE)
              stderr_fd = _open_osfhandle ((intptr_t)errout, O_APPEND | 
O_BINARY);
+#endif
            if (stderr_fd >= 0)
              write (stderr_fd, "\r\nBacktrace:\r\n", 14);
            errfile_fd = _open ("emacs_backtrace.txt", O_RDWR | O_CREAT | 
O_BINARY, S_IREAD | S_IWRITE);