Adapt to addition of ignore-value.h in 2011-02-03T19:29:35Z!eggert@cs.ucla.edu.

[bpt/emacs.git] / nt / config.nt

diff --git a/nt/config.nt b/nt/config.nt
index 53d8970..b5ef24f 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -305,13 +305,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Name of package */
 #define PACKAGE "emacs"
 
-/* FIXME: This is defined by the various makefile.w32-in files for
-   now.  Revisit if/when VERSION from config.h is used by any
-   Makefile.in files.  */
-#if 0
 /* Version number of package */
 #define VERSION "24.0.50"
-#endif
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
@@ -319,6 +314,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef inline
 #endif
 
+/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
+#ifdef __GNUC__
+# define restrict __restrict__
+#else
+# define restrict
+#endif
+
 /* Define as a marker that can be attached to declarations that might not
     be used.  This helps to reduce warnings, such as from
     GCC -Wunused-parameter.  */
@@ -336,6 +340,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* If using GNU, then support inline function declarations. */
 #ifdef __GNUC__
 #define INLINE __inline__
+#define inline __inline__
 #else
 #define INLINE
 #endif