21.2 b33 Update for MinGW32
Amazingly enough, it didn't take much to get mingw32 to work
again! Below is a patch to make mingw32 work for me in
Cygwin v1.1.0.
Andy, you may want to pay special attention to the places in
nt.c where I disabled the checks for __MINGW32__. I'm still
not sure how different v1.0.0 is from v1.1.0.
If there are no comments, I will submit a formal patch with
ChangeLog entries.
Craig
------------------
/ > uname -a
CYGWIN_98-4.10 CRAIG 1.1.0(0.17/3/2) 2000-03-01 00:15:19 i586 unknown
Index: nt/inc/sys/socket.h
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/nt/inc/sys/socket.h,v
retrieving revision 1.3
diff -u -r1.3 socket.h
--- socket.h 1998/05/06 09:46:20 1.3
+++ socket.h 2000/05/10 02:39:29
＠＠ -22,7 +22,7 ＠＠
#endif /* 0 */
/* avoid duplicate definition of timeval */
-#ifdef HAVE_TIMEVAL
+#if defined(HAVE_TIMEVAL) && !defined(__MINGW32__)
#define timeval ws_timeval
#endif
Index: src/nt.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/nt.c,v
retrieving revision 1.17.2.18
diff -u -r1.17.2.18 nt.c
--- nt.c 2000/05/07 12:56:43 1.17.2.18
+++ nt.c 2000/05/10 02:39:34
＠＠ -2072,7 +2072,7 ＠＠
return TRUE;
}
-#ifndef __MINGW32__
+#if 1 /* !defined(__MINGW32__) */
/* Return pointer to section header for section containing the given
relative virtual address. */
static IMAGE_SECTION_HEADER *
＠＠ -2143,7 +2143,7 ＠＠
start with a DOS program stub. Note that 16-bit Windows
executables use the OS/2 1.x format. */
-#ifdef __MINGW32__
+#if 0 /* defined( __MINGW32__ ) */
/* mingw32 doesn't have enough headers to detect cygwin
apps, just do what we can. */
FILHDR * exe_header;
Index: src/syscommctrl.h
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/Attic/syscommctrl.h,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 syscommctrl.h
--- syscommctrl.h 2000/05/07 12:56:45 1.1.2.2
+++ syscommctrl.h 2000/05/10 02:39:35
＠＠ -54,6 +54,9 ＠＠
#ifndef TCS_VERTICAL
#define TCS_VERTICAL 0x0080
#endif
+#ifndef PBS_SMOOTH
+#define PBS_SMOOTH 0x01
+#endif
#ifndef ICC_BAR_CLASSES
#define ICC_BAR_CLASSES 4
Index: src/syswindows.h
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/Attic/syswindows.h,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 syswindows.h
--- syswindows.h 2000/05/07 12:56:45 1.1.2.2
+++ syswindows.h 2000/05/10 02:39:36
＠＠ -90,9 +90,6 ＠＠
#ifndef WM_MOUSEWHEEL
#define WM_MOUSEWHEEL 0x20A
#endif
-#ifndef PBS_SMOOTH
-#define PBS_SMOOTH 0x01
-#endif
#ifndef VK_APPS
#define VK_APPS 0x5D
#endif
Index: src/s/mingw32.h
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/s/Attic/mingw32.h,v
retrieving revision 1.1.2.8
diff -u -r1.1.2.8 mingw32.h
--- mingw32.h 2000/05/03 14:47:22 1.1.2.8
+++ mingw32.h 2000/05/10 02:39:38
＠＠ -229,6 +229,7 ＠＠
#undef HAVE_SYS_WAIT_H
#undef HAVE_TERMIOS
#undef SYSV_SYSTEM_DIR
+#undef CLASH_DETECTION
/* We now have emulation for some signals */
#define HAVE_SIGHOLD