From 476b1b2da13aabbc29083282b8850d9522ab2982 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 31 Jul 2012 19:02:12 -0400 Subject: [PATCH] Minor rearrangement for src/conf_post.h * src/conf_post.h (config_opsysfile): Move earlier, so that WINDOWSNT is available. (alloca.h) [WINDOWSNT]: Don't include it on MS Windows. --- src/ChangeLog | 4 ++++ src/conf_post.h | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 46302316204..ccbb5ae5764 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2012-07-31 Glenn Morris + * conf_post.h (config_opsysfile): Move earlier, so that WINDOWSNT + is available. + (alloca.h) [WINDOWSNT]: Don't include it on MS Windows. + * process.h (NULL_DEVICE): * emacs.c (SEPCHAR): * editfns.c (USER_FULL_NAME): Let configure set them. diff --git a/src/conf_post.h b/src/conf_post.h index aa09ae7228c..c4a27c10d85 100644 --- a/src/conf_post.h +++ b/src/conf_post.h @@ -27,11 +27,18 @@ along with GNU Emacs. If not, see . */ /* Code: */ +/* Include any platform specific configuration file. */ +#ifdef config_opsysfile +# include config_opsysfile +#endif + +#ifndef WINDOWSNT /* On AIX 3 this must be included before any other include file. */ #include #if ! HAVE_ALLOCA # error "alloca not available on this machine" #endif +#endif #ifdef SIGNAL_H_AHB #undef SIGNAL_H_AHB @@ -107,11 +114,6 @@ char *_getpty(); #endif #endif /* USG5_4 */ -/* Include the os dependent file. */ -#ifdef config_opsysfile -# include config_opsysfile -#endif - /* Mac OS X / GNUstep need a bit more pure memory. Of the existing knobs, SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. */ #ifdef HAVE_NS -- 2.39.2