X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/2bef61c9f13a78d19f759f5a5300351adc96df1d..ca6e909ce36b365d705dd29e5c7f9a5a7904c719:/nt/config.nt
diff --git a/nt/config.nt b/nt/config.nt
index 4a0d6897b0..f000d53e41 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1,13 +1,13 @@
/* GNU Emacs site configuration template file. -*- C -*-
- Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
This file is part of GNU Emacs.
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see . */
/* No code in Emacs #includes config.h twice, but some of the code
@@ -77,17 +75,12 @@ Boston, MA 02110-1301, USA. */
/* Define if we have the X11R6 or newer version of Xlib. */
#undef HAVE_X11R6
-/* Define if we have the X11R5 or newer version of Xlib. */
-#undef HAVE_X11R5
-
/* Define if netdb.h declares h_errno. */
#undef HAVE_H_ERRNO
/* If we're using any sort of window system, define some consequences. */
#ifdef HAVE_X_WINDOWS
#define HAVE_WINDOW_SYSTEM
-#define MULTI_KBOARD
-#define HAVE_FACES
#define HAVE_MOUSE
#endif
@@ -140,6 +133,8 @@ Boston, MA 02110-1301, USA. */
#undef HAVE_TERMIOS_H
#undef HAVE_LIMITS_H
#undef HAVE_STRING_H
+#undef HAVE_STRINGS_H
+#undef HAVE_STDLIB_H
#undef HAVE_PWD_H
#undef STDC_HEADERS
#undef TIME_WITH_SYS_TIME
@@ -205,8 +200,6 @@ Boston, MA 02110-1301, USA. */
#undef CRAY_STACKSEG_END
-#undef UNEXEC_SRC
-
#undef HAVE_LIBXBSD
#undef HAVE_XRMSETDATABASE
#undef HAVE_XSCREENRESOURCESTRING
@@ -312,17 +305,6 @@ Boston, MA 02110-1301, USA. */
#undef config_machfile
#include "m/intel386.h"
-/* Load in the conversion definitions if this system
- needs them and the source file being compiled has not
- said to inhibit this. There should be no need for you
- to alter these lines. */
-
-#ifdef SHORTNAMES
-#ifndef NO_SHORTNAMES
-#include "../shortnames/remap.h"
-#endif /* not NO_SHORTNAMES */
-#endif /* SHORTNAMES */
-
/* If no remapping takes place, static variables cannot be dumped as
pure, so don't worry about the `static' keyword. */
#ifdef NO_REMAP
@@ -332,20 +314,9 @@ Boston, MA 02110-1301, USA. */
/* Define `subprocesses' should be defined if you want to
have code for asynchronous subprocesses
(as used in M-x compile and M-x shell).
- These do not work for some USG systems yet;
- for the ones where they work, the s/SYSTEM.h file defines this flag. */
+ Only MSDOS does not support this. */
-#ifndef VMS
-#ifndef USG
-/* #define subprocesses */
-#endif
-#endif
-
-/* Define LD_SWITCH_SITE to contain any special flags your loader may need. */
-#undef LD_SWITCH_SITE
-
-/* Define C_SWITCH_SITE to contain any special flags your compiler needs. */
-#undef C_SWITCH_SITE
+#define subprocesses
/* Define LD_SWITCH_X_SITE to contain any special flags your loader
may need to deal with X Windows. For instance, if you've defined
@@ -448,10 +419,6 @@ extern char *getenv ();
#define POINTER_TYPE void
#endif
-#ifndef PTR
-#define PTR POINTER_TYPE *
-#endif
-
#ifndef PROTOTYPES
#define PROTOTYPES 1
#endif
@@ -469,6 +436,12 @@ extern char *getenv ();
#ifdef HAVE_STRING_H
#include "string.h"
#endif
+#ifdef HAVE_STRINGS_H
+#include "strings.h"
+#endif
+#ifdef HAVE_STDLIB_H
+#include
+#endif
#endif
#ifndef NO_RETURN
@@ -479,5 +452,20 @@ extern char *getenv ();
#endif
#endif
+/* Redefine abort. */
+#ifndef NOT_C_CODE
+#ifdef HAVE_NTGUI
+#define abort w32_abort
+void w32_abort (void) NO_RETURN;
+#endif
+#endif
+
+/* Prevent accidental use of features unavailable in
+ older Windows versions we still support. */
+#define _WIN32_WINNT 0x0400
+
+/* Make a leaner executable. */
+#define WIN32_LEAN_AND_MEAN 1
+
/* arch-tag: df720992-aa5a-499a-882d-958dc5eeb5e9
(do not change this comment) */