[Emacs-diffs] /srv/bzr/emacs/trunk r103847: Fix the Windows build due to introduction of ATTRIBUTE_FORMAT_PRINTF.

[Eli Zaretskii]

------------------------------------------------------------
revno: 103847
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2011-04-06 18:44:32 +0300
message:
  Fix the Windows build due to introduction of ATTRIBUTE_FORMAT_PRINTF.
  
   nt/config.nt (NO_INLINE, ATTRIBUTE_FORMAT)
   (ATTRIBUTE_FORMAT_PRINTF): Define, as followup to revision 103841
   on the trunk on 2011-04-06.
modified:
  nt/ChangeLog
  nt/config.nt

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2011-04-06 12:18:10 +0000
+++ b/nt/ChangeLog      2011-04-06 15:44:32 +0000
@@ -1,3 +1,9 @@
+2011-04-06  Eli Zaretskii  <address@hidden>
+
+       * config.nt (NO_INLINE, ATTRIBUTE_FORMAT)
+       (ATTRIBUTE_FORMAT_PRINTF): Define, as followup to revision 103841
+       on the trunk on 2011-04-06.
+
 2011-03-27  Glenn Morris  <address@hidden>
 
        * config.nt: Remove RETSIGTYPE, SIGTYPE (identical to void).

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2011-03-27 02:27:11 +0000
+++ b/nt/config.nt      2011-04-06 15:44:32 +0000
@@ -345,12 +345,32 @@
 #define INLINE
 #endif
 
+#if __GNUC__ >= 3  /* On GCC 3.0 we might get a warning.  */
+#define NO_INLINE __attribute__((noinline))
+#else
+#define NO_INLINE
+#endif
+
 #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1))
 #define EXTERNALLY_VISIBLE __attribute__((externally_visible))
 #else
 #define EXTERNALLY_VISIBLE
 #endif
 
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+# define ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
+#else
+# define ATTRIBUTE_FORMAT(spec) /* empty */
+#endif
+
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
+# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
+   ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument))
+#else
+# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
+   ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
+#endif
+
 #if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8))
 #define HAVE___BUILTIN_UNWIND_INIT 1
 #endif