diff options
| author | Eli Zaretskii | 2011-04-06 18:44:32 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2011-04-06 18:44:32 +0300 |
| commit | 0f1ba050b3e8228b47e77ec77e5047c7c3276fdf (patch) | |
| tree | 803a72b43f300187e94861c332f292acf5ffaa2b | |
| parent | f1f81baa2cc69ea0c0b13118d3559ddfb285305b (diff) | |
| download | emacs-0f1ba050b3e8228b47e77ec77e5047c7c3276fdf.tar.gz emacs-0f1ba050b3e8228b47e77ec77e5047c7c3276fdf.zip | |
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 2011-04-06T05:19:39Z!eggert@cs.ucla.edu
on the trunk on 2011-04-06.
| -rw-r--r-- | nt/ChangeLog | 6 | ||||
| -rw-r--r-- | nt/config.nt | 20 |
2 files changed, 26 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 9f8df7ee62b..155ee41d9da 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-04-06 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * config.nt (NO_INLINE, ATTRIBUTE_FORMAT) | ||
| 4 | (ATTRIBUTE_FORMAT_PRINTF): Define, as followup to 2011-04-06T05:19:39Z!eggert@cs.ucla.edu | ||
| 5 | on the trunk on 2011-04-06. | ||
| 6 | |||
| 1 | 2011-03-27 Glenn Morris <rgm@gnu.org> | 7 | 2011-03-27 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * config.nt: Remove RETSIGTYPE, SIGTYPE (identical to void). | 9 | * config.nt: Remove RETSIGTYPE, SIGTYPE (identical to void). |
diff --git a/nt/config.nt b/nt/config.nt index 1d9a5faaf2c..74217c9c048 100644 --- a/nt/config.nt +++ b/nt/config.nt | |||
| @@ -345,12 +345,32 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 345 | #define INLINE | 345 | #define INLINE |
| 346 | #endif | 346 | #endif |
| 347 | 347 | ||
| 348 | #if __GNUC__ >= 3 /* On GCC 3.0 we might get a warning. */ | ||
| 349 | #define NO_INLINE __attribute__((noinline)) | ||
| 350 | #else | ||
| 351 | #define NO_INLINE | ||
| 352 | #endif | ||
| 353 | |||
| 348 | #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) | 354 | #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) |
| 349 | #define EXTERNALLY_VISIBLE __attribute__((externally_visible)) | 355 | #define EXTERNALLY_VISIBLE __attribute__((externally_visible)) |
| 350 | #else | 356 | #else |
| 351 | #define EXTERNALLY_VISIBLE | 357 | #define EXTERNALLY_VISIBLE |
| 352 | #endif | 358 | #endif |
| 353 | 359 | ||
| 360 | #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) | ||
| 361 | # define ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) | ||
| 362 | #else | ||
| 363 | # define ATTRIBUTE_FORMAT(spec) /* empty */ | ||
| 364 | #endif | ||
| 365 | |||
| 366 | #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) | ||
| 367 | # define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ | ||
| 368 | ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument)) | ||
| 369 | #else | ||
| 370 | # define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ | ||
| 371 | ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) | ||
| 372 | #endif | ||
| 373 | |||
| 354 | #if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)) | 374 | #if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)) |
| 355 | #define HAVE___BUILTIN_UNWIND_INIT 1 | 375 | #define HAVE___BUILTIN_UNWIND_INIT 1 |
| 356 | #endif | 376 | #endif |