[Emacs-diffs] /srv/bzr/emacs/trunk r107122: * lib/makefile.w32-in (PRAGMA_SYSTEM_HEADER): Move to platform

[Christoph Scholtes]

------------------------------------------------------------
revno: 107122
committer: Christoph Scholtes <address@hidden>
branch nick: trunk
timestamp: Sun 2012-02-05 13:40:36 -0700
message:
  * lib/makefile.w32-in (PRAGMA_SYSTEM_HEADER): Move to platform
  specific makefiles to support getopt_.h generation with MSVC.
  
  * nt/gmake.defs (PRAGMA_SYSTEM_HEADER): Add for GCC.
  
  * nt/nmake.defs (PRAGMA_SYSTEM_HEADER): Add, but ignore with MSVC.
modified:
  ChangeLog
  lib/makefile.w32-in
  nt/ChangeLog
  nt/gmake.defs
  nt/nmake.defs

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-02-04 22:27:28 +0000
+++ b/ChangeLog 2012-02-05 20:40:36 +0000
@@ -1,3 +1,8 @@
+2012-02-05  Christoph Scholtes  <address@hidden>
+
+       * lib/makefile.w32-in (PRAGMA_SYSTEM_HEADER): Move to platform
+       specific makefiles to support getopt_.h generation with MSVC.
+
 2012-02-04  Glenn Morris  <address@hidden>
 
        * Makefile.in (uninstall):

=== modified file 'lib/makefile.w32-in'
--- a/lib/makefile.w32-in       2012-01-30 18:33:36 +0000
+++ b/lib/makefile.w32-in       2012-02-05 20:40:36 +0000
@@ -213,7 +213,6 @@
 
 HAVE_GETOPT_H = HAVE_GETOPT_H
 INCLUDE_NEXT = include_next
-PRAGMA_SYSTEM_HEADER = \#pragma GCC system_header
 PRAGMA_COLUMNS =
 NEXT_GETOPT_H = <getopt.h>
 ARG_NONNULL_H = ../build-aux/snippet/arg-nonnull.h

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-02-05 20:14:54 +0000
+++ b/nt/ChangeLog      2012-02-05 20:40:36 +0000
@@ -1,5 +1,9 @@
 2012-02-05  Christoph Scholtes  <address@hidden>
 
+       * gmake.defs (PRAGMA_SYSTEM_HEADER): Add for GCC.
+
+       * nmake.defs (PRAGMA_SYSTEM_HEADER): Add, but ignore with MSVC.
+
        * makefile.w32-in (maybe-copy-distfiles)
        (maybe-copy-distfiles-CMD, maybe-copy-distfiles-SH)
        (create-tmp-dist-dir): Added to make --distfiles optional.

=== modified file 'nt/gmake.defs'
--- a/nt/gmake.defs     2012-01-19 07:21:25 +0000
+++ b/nt/gmake.defs     2012-02-05 20:40:36 +0000
@@ -289,6 +289,8 @@
 USER_LIBS := $(patsubst %,-l%,$(USER_LIBS))
 endif
 
+PRAGMA_SYSTEM_HEADER = \#pragma GCC system_header
+
 ifeq "$(ARCH)" "i386"
 ifdef NOOPT
 ARCH_CFLAGS     = -c $(DEBUG_FLAG) $(NOCYGWIN)

=== modified file 'nt/nmake.defs'
--- a/nt/nmake.defs     2012-01-19 07:21:25 +0000
+++ b/nt/nmake.defs     2012-02-05 20:40:36 +0000
@@ -203,6 +203,9 @@
 D = d
 !endif
 
+# gcc-specific pragma (ignore for MSVC)
+PRAGMA_SYSTEM_HEADER =
+
 !if "$(ARCH)" == "i386"
 !ifdef NOOPT
 #ARCH_CFLAGS     = -nologo -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG)