[Emacs-diffs] /srv/bzr/emacs/trunk r109343: Minor rearrangement for src/conf_post.h

[Glenn Morris]

------------------------------------------------------------
revno: 109343
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-31 19:02:12 -0400
message:
  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.
modified:
  src/ChangeLog
  src/conf_post.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-31 22:24:49 +0000
+++ b/src/ChangeLog     2012-07-31 23:02:12 +0000
@@ -1,5 +1,9 @@
 2012-07-31  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'src/conf_post.h'
--- a/src/conf_post.h   2012-07-31 18:34:26 +0000
+++ b/src/conf_post.h   2012-07-31 23:02:12 +0000
@@ -27,11 +27,18 @@
 
 /* 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 <alloca.h>
 #if ! HAVE_ALLOCA
 # error "alloca not available on this machine"
 #endif
+#endif
 
 #ifdef SIGNAL_H_AHB
 #undef SIGNAL_H_AHB
@@ -107,11 +114,6 @@
 #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