*** empty log message ***

[gnu-emacs] / src / s / ms-w32.h

diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index a109dc9d91d6adee80cd45fd3d0f3d8d0f130b95..b1989318fba43d43075edc2b54aca4e6093870ef 100644 (file)
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -1,5 +1,6 @@
 /* System description file for Windows NT.
-   Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*
  *      Define symbols to identify the version of Unix this is.
@@ -189,6 +190,8 @@ Boston, MA 02111-1307, USA.  */
    is not ':', #define this to be the appropriate character constant.  */
 #define SEPCHAR ';'
 
+#define ORDINARY_LINK 1
+
 /* ============================================================ */
 
 /* Here, add any special hacks needed
@@ -210,12 +213,12 @@ Boston, MA 02111-1307, USA.  */
 
 /* The null device on Windows NT. */
 #define NULL_DEVICE     "NUL:"
-#define EXEC_SUFFIXES   ".exe:.com:.bat:.cmd:"
 
 #ifndef MAXPATHLEN
 #define MAXPATHLEN      _MAX_PATH
 #endif
 
+#define HAVE_SOUND  1
 #define LISP_FLOAT_TYPE 1
 
 #undef  HAVE_SYS_SELECT_H
@@ -228,6 +231,7 @@ Boston, MA 02111-1307, USA.  */
 #undef  HAVE_TERMIOS_H
 #define HAVE_LIMITS_H 1
 #define HAVE_STRING_H 1
+#define HAVE_PWD_H 1
 #define STDC_HEADERS 1
 #define TIME_WITH_SYS_TIME 1
 
@@ -261,7 +265,7 @@ Boston, MA 02111-1307, USA.  */
 #undef  HAVE_RES_INIT /* For -lresolv on Suns.  */
 #undef  HAVE_SETSID
 #undef  HAVE_FPATHCONF
-#undef  HAVE_SELECT
+#define HAVE_SELECT 1
 #define HAVE_MKTIME 1
 #undef  HAVE_EUIDACCESS
 #define HAVE_GETPAGESIZE 1
@@ -308,6 +312,7 @@ Boston, MA 02111-1307, USA.  */
 #define chdir   sys_chdir
 #undef chmod
 #define chmod   sys_chmod
+#define chown   sys_chown
 #undef close
 #define close   sys_close
 #undef creat
@@ -351,7 +356,9 @@ Boston, MA 02111-1307, USA.  */
 #define fcloseall _fcloseall
 #define fdopen   _fdopen
 #define fgetchar  _fgetchar
+#ifndef fileno
 #define fileno   _fileno
+#endif
 #define flushall  _flushall
 #define fputchar  _fputchar
 #define fsync    _commit
@@ -438,7 +445,7 @@ extern char *get_emacs_configuration_options (void);
 
 #include <sys/stat.h>
 
-/* Define for those source files that do not include enough NT 
+/* Define for those source files that do not include enough NT
    system files.  */
 #ifndef NULL
 #ifdef __cplusplus
@@ -455,12 +462,6 @@ extern char *get_emacs_configuration_options (void);
 #endif
 #include <string.h>
 
-/* Emacs takes care of ensuring that these are defined.  */
-#ifdef max
-#undef max
-#undef min
-#endif
-
 /* We need a little extra space, see ../../lisp/loadup.el */
 #define SYSTEM_PURESIZE_EXTRA 137500
 
@@ -481,8 +482,10 @@ extern char *get_emacs_configuration_options (void);
    must include config.h to pick up this pragma.  */
 
 /* Names must be < 8 bytes */
+#ifdef _MSC_VER
 #pragma data_seg("EMDATA")
 #pragma bss_seg("EMBSS")
+#endif
 
 /* #define FULL_DEBUG */
 /* #define EMACSDEBUG */
@@ -496,3 +499,6 @@ extern void _DebPrint (const char *fmt, ...);
 
 
 /* ============================================================ */
+
+/* arch-tag: 5d4a3a1c-40dc-4dea-9c7c-38fed9ae0eae
+   (do not change this comment) */