diff src/syswindows.h @ 558:ed498ef2108b

[xemacs-hg @ 2001-05-23 09:59:33 by ben] xemacs.mak: call `ver' to get the exact os version and put it in the installation; suggestion from adrian. behavior-defs.el: Add scroll-in-place, jka-compr, efs, fix up some things. pop.c: Remove BROKEN_CYGWIN. etc\sample.init.el: Rewrite to be much more careful about loading features -- now it decays gracefully even in the complete absence of packages. Also avoid doing obnoxious things when loading efs. configure.in: add some support for eventually turning on file coding by default. Fix numerous places where AC_MSG_WARN had quotes around its arg, which is bad. Replace with []. Same for AC_MSG_ERROR. s\cygwin32.h, s\mingw32.h: remove support for way old beta versions of cygwin. don't put -Wno-sign-compare in the system switches; this isn't a system issue. define BROKEN_SIGIO for cygwin to get C-g support. device-msw.c: signal an error rather than crash with an unavailable network printer (from Mike Alexander). event-msw.c: cleanup headers. fix (hopefully) an error with data corruption when sending to a network connection. fileio.c: Fix evil code that attempts to handle the ~user prefix by (a) always assuming we're referencing ourselves and not even verifying the user -- hence any file with a tilde as its first char is invalid! (b) if there wasn't a slash following the filename, the pointer was set *past* the end of file and we started reading from uninitialized memory. Now we simply treat these as files, always. optionally for 21.4 (doc fix): lread.c: cambia de pas_de_lache_ici -- al minimo usa la palabra certa. frame.c: fix warnings. emacs.c, nt.c, ntproc.c, process-nt.c, realpath.c, unexnt.c: rename MAX_PATH to standard PATH_MAX. process-nt.c, realpath.c: cleanup headers. process-unix.c, sysdep.c, systime.h, syswindows.h: kill BROKEN_CYGWIN and support for way old beta versions of cygwin. sysfile.h: use _MAX_PATH (Windows) preferentially for PATH_MAX if defined. include io.h on Cygwin (we need get_osfhandle()). include sys/fcntl.h always, since we were including it in various header files anyway. unexcw.c: fix up style to conform to standard. remove duplicate definition of PERROR. buffer.c: comment change. database.c, debug.h, device-tty.c, dired-msw.c, glyphs-msw.c: header cleanups (remove places that directly include a system header file, because we have our own layer to do this more cleanly and portably); indentation fixes.
author ben
date Wed, 23 May 2001 09:59:48 +0000
parents 666d73d6ac56
children 5fd7ba8b56e7
line wrap: on
line diff
--- a/src/syswindows.h	Tue May 22 06:49:43 2001 +0000
+++ b/src/syswindows.h	Wed May 23 09:59:48 2001 +0000
@@ -1,5 +1,5 @@
 /* Copyright (C) 2000 Free Software Foundation, Inc.
-   Copyright (C) 2000 Ben Wing.
+   Copyright (C) 2000, 2001 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -57,25 +57,19 @@
 
 #include <windows.h>
 
-#if defined (CYGWIN) && CYGWIN_VERSION_DLL_MAJOR < 21
-extern BOOL WINAPI DdeFreeStringHandle(DWORD,HSZ);
-extern BOOL WINAPI PlaySound(LPCSTR,HMODULE,DWORD);
-#define stricmp strcasecmp
-#define FONTENUMPROC FONTENUMEXPROC
-#define ntmTm ntmentm
-#elif defined (WIN32_LEAN_AND_MEAN)
-#ifdef HAVE_X_WINDOWS
+#if defined (WIN32_LEAN_AND_MEAN)
+# ifdef HAVE_X_WINDOWS
 /* Christ almighty.  The problems you get when combining two large code bases,
    neither with any respect for namespace purity. */
-#undef Status
-#endif
-#include <winspool.h>
-#ifdef HAVE_X_WINDOWS
-#define Status int
-#endif
-#include <mmsystem.h>
-#include <shellapi.h>
-#include <ddeml.h>
+#  undef Status
+# endif
+# include <winspool.h>
+# ifdef HAVE_X_WINDOWS
+#  define Status int
+# endif
+# include <mmsystem.h>
+# include <shellapi.h>
+# include <ddeml.h>
 #endif
 
 #include <lmaccess.h> /* next three for NetUserEnum and friends */