17 files changed, 58 insertions, 46 deletions

diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index c2715fffe01..37b041396f9 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1999, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -47,11 +47,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* AIX doesn't define this.  */
 #define unix 1
 
-/* string.h defines rindex as a macro, at least with native cc, so we
-   lose declaring char * rindex without this.
-   It is just a guess which versions of AIX need this definition.  */
-#undef HAVE_STRING_H
-
 /* Perry Smith <pedz@ddivt1.austin.ibm.com> says these are correct.  */
 #define SIGNALS_VIA_CHARACTERS
 #define CLASH_DETECTION
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index 0cca005b423..c2dbdb9a109 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on bsd 4.3
 
-Copyright (C) 1985-1986, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index af5308ff7bb..9a371829eaa 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -1,6 +1,6 @@
 /* System description header file for Cygwin.
 
-Copyright (C) 1985-1986, 1992, 1999, 2002-2011 Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 1992, 1999, 2002-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -91,9 +91,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    why it needed to be changed.  */
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
 
-/* Virtual addresses of pure and impure space can vary, as on Windows.  */
-#define VIRT_ADDR_VARIES
-
 /* Emacs supplies its own malloc, but glib (part of Gtk+) calls
    memalign and on Cygwin, that becomes the Cygwin-supplied memalign.
    As malloc is not the Cygwin malloc, the Cygwin memalign always
diff --git a/src/s/darwin.h b/src/s/darwin.h
index dd0d0c34021..9ac9e91fd9d 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -1,6 +1,6 @@
 /* System description header file for Darwin (Mac OS X).
 
-Copyright (C) 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index 24b34e02f69..c74605fe366 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -1,6 +1,6 @@
 /* System description header for FreeBSD systems.
 
-Copyright (C) 1994-2011  Free Software Foundation, Inc.
+Copyright (C) 1994-2012  Free Software Foundation, Inc.
 
 Author: Shawn M. Carey
 (according to authors.el)
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 178d7082f72..b54bd985e6b 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -1,6 +1,6 @@
 /* This file is the configuration file for Linux-based GNU systems
 
-Copyright (C) 1985-1986, 1992, 1994, 1996, 1999, 2001-2011
+Copyright (C) 1985-1986, 1992, 1994, 1996, 1999, 2001-2012
   Free Software Foundation, Inc.
 
 This file was put together by Michael K. Johnson and Rik Faith.
@@ -103,7 +103,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* This is needed for dispnew.c:update_frame.  */
 #ifdef emacs
 #include <stdio.h>  /* Get the definition of _IO_STDIO_H.  */
-#if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM)
+#if defined (_IO_STDIO_H) || defined (_STDIO_USES_IOSTREAM)
 /* New C libio names.  */
 #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
   ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
@@ -155,7 +155,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
     extern void *__libc_ia64_register_backing_store_base;       \
     __builtin_ia64_flushrs ();                                  \
     mark_memory (__libc_ia64_register_backing_store_base,       \
-                 __builtin_ia64_bsp (), 0);                     \
+                 __builtin_ia64_bsp ());                        \
   } while (0)
 #endif
 #endif
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 8f6035b36a7..37aaa1357cc 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on the GNU Hurd.
 
-Copyright (C) 1994-1996, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -37,10 +37,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef emacs
 #include <stdio.h>  /* Get the definition of _IO_STDIO_H.  */
-#if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM)
+#if defined (_IO_STDIO_H) || defined (_STDIO_USES_IOSTREAM)
 /* new C libio names */
 #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
   ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
 #endif /* !_IO_STDIO_H */
 #endif /* emacs */
 
+#define POSIX_SIGNALS 1
+
+/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
+#define GC_MARK_STACK   GC_MAKE_GCPROS_NOOPS
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 1cd91a41b55..becb5d3464e 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -1,6 +1,6 @@
 /* System description file for hpux version 10.20.
 
-Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1999, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -89,7 +89,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef HAVE_RANDOM
 
 
-/* Rainer Malzbender <rainer@displaytech.com> says definining
+/* Rainer Malzbender <rainer@displaytech.com> says defining
    HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC.  */
 #ifndef HAVE_XRMSETDATABASE
 #define HAVE_XRMSETDATABASE
@@ -100,14 +100,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    header sections which lose when `static' is defined away, as it is
    on HP-UX.  (You get duplicate symbol errors on linking). */
 #undef _FILE_OFFSET_BITS
-
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-#define VIRT_ADDR_VARIES
 
 /* The data segment on this machine always starts at address 0x40000000.  */
 #define DATA_SEG_BITS 0x40000000
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 26eb7dcde77..32374498fe7 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics Irix system 6.5.
 
-Copyright (C) 1999-2011  Free Software Foundation, Inc.
+Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index bf6cc66798c..d533ae34ac3 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -1,6 +1,6 @@
 /* System description file for Windows NT.
 
-Copyright (C) 1993-1995, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1993-1995, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -86,6 +86,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_))
 
 #include <sys/types.h>
+
+#ifdef _MSC_VER
+typedef unsigned long sigset_t;
+typedef int ssize_t;
+#endif
+
 struct sigaction {
   int sa_flags;
   void (*sa_handler)(int);
@@ -111,11 +117,7 @@ struct sigaction {
 #undef  HAVE_UTIME_H
 #undef  HAVE_LINUX_VERSION_H
 #undef  HAVE_SYS_SYSTEMINFO_H
-#define HAVE_LIMITS_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STDLIB_H 1
 #define HAVE_PWD_H 1
-#define STDC_HEADERS 1
 #define TIME_WITH_SYS_TIME 1
 
 #define HAVE_GETTIMEOFDAY 1
@@ -185,6 +187,17 @@ struct sigaction {
 
 #ifdef emacs
 
+#ifdef _MSC_VER
+#include <sys/timeb.h>
+#include <sys/stat.h>
+#include <signal.h>
+
+/* MSVC gets link-time errors without these redirections.  */
+#define fstat(a, b) sys_fstat(a, b)
+#define stat(a, b)  sys_stat(a, b)
+#define utime       sys_utime
+#endif
+
 /* Calls that are emulated or shadowed.  */
 #undef access
 #define access  sys_access
@@ -254,6 +267,8 @@ struct sigaction {
 #define getpid    _getpid
 #ifdef _MSC_VER
 typedef int pid_t;
+#define snprintf  _snprintf
+#define strtoll   _strtoi64
 #endif
 #define isatty    _isatty
 #define logb      _logb
@@ -262,15 +277,18 @@ typedef int pid_t;
 #define popen     _popen
 #define pclose    _pclose
 #define umask     _umask
+#ifndef _MSC_VER
 #define utimbuf   _utimbuf
+#endif
 #define strdup    _strdup
 #define strupr    _strupr
 #define strnicmp  _strnicmp
 #define stricmp   _stricmp
 #define tzset     _tzset
 
-#if !defined (_MSC_VER) || (_MSC_VER < 1400)
 #define tzname    _tzname
+#if !defined (_MSC_VER) || (_MSC_VER < 1400)
+#undef  utime
 #define utime     _utime
 #endif
 
@@ -321,13 +339,17 @@ extern char *get_emacs_configuration_options (void);
 #define _WINSOCK_H
 
 /* Defines size_t and alloca ().  */
-#ifdef USE_CRT_DLL
+#ifdef emacs
 #define malloc e_malloc
 #define free   e_free
 #define realloc e_realloc
 #define calloc e_calloc
 #endif
+#ifdef _MSC_VER
+#define alloca _alloca
+#else
 #include <malloc.h>
+#endif
 
 #include <sys/stat.h>
 
@@ -386,4 +408,3 @@ extern void _DebPrint (const char *fmt, ...);
 
 
 /* ============================================================ */
-
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 29ca0629899..cde24147c57 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -1,6 +1,6 @@
 /* System description file for MS-DOS
 
-Copyright (C) 1993, 1996-1997, 2001-2011 Free Software Foundation, Inc.
+Copyright (C) 1993, 1996-1997, 2001-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -119,7 +119,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 #ifdef HAVE_X_WINDOWS
 /* We need a little extra space, see ../../lisp/loadup.el and the
    commentary below, in the non-X branch.  The 140KB number was
-   measured on GNU/Linux and on MS-WIndows.  */
+   measured on GNU/Linux and on MS-Windows.  */
 #define SYSTEM_PURESIZE_EXTRA (-170000+140000)
 #else
 /* We need a little extra space, see ../../lisp/loadup.el.
@@ -138,4 +138,3 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
    registers relevant for conservative garbage collection in the jmp_buf.  */
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 52cda717a2d..f25023fb615 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -1,6 +1,6 @@
 /* s/ file for netbsd system.
 
-Copyright (C) 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/openbsd.h b/src/s/openbsd.h
index 175d61dc9c9..0a8bab2290f 100644
--- a/src/s/openbsd.h
+++ b/src/s/openbsd.h
@@ -1,5 +1,9 @@
 /* System file for openbsd.  */
 
-/* The same as NetBSD.  Note there are differences in configure.  */
+/* Nearly the same as NetBSD.  Note there are differences in configure.  */
 #include "netbsd.h"
 
+/* The symbol SIGIO is defined, but the feature doesn't work in the
+   way Emacs needs it to.  See
+   <http://article.gmane.org/gmane.os.openbsd.ports/46831>.  */
+#define BROKEN_SIGIO
diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
index 3d9bd6ddafc..a9fefcb1992 100644
--- a/src/s/sol2-6.h
+++ b/src/s/sol2-6.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Solaris 2.6.
 
-Copyright (C) 1999-2011  Free Software Foundation, Inc.
+Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/template.h b/src/s/template.h
index 4e0400e99e3..527694bd4bb 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -2,7 +2,7 @@
    This file describes the parameters that system description files
    should define or not.
 
-Copyright (C) 1985-1986, 1992, 1999, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 1992, 1999, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/unixware.h b/src/s/unixware.h
index 8fe28625dd4..22c396a060e 100644
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -1,6 +1,6 @@
 /* s/ file for Unixware.
 
-Copyright (C) 1999-2011  Free Software Foundation, Inc.
+Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index e6d992d8f9c..fabdd66f3bb 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 4
 
-Copyright (C) 1987, 1990, 1999-2011  Free Software Foundation, Inc.
+Copyright (C) 1987, 1990, 1999-2012  Free Software Foundation, Inc.
 
 Written by James Van Artsdalen of Dell Computer Corp. james@bigtex.cactus.org.
 Subsequently improved for Dell 2.2 by Eric S. Raymond <esr@snark.thyrsus.com>.