Re: [Emacs-diffs] /srv/bzr/emacs/trunk r109306: Use an include file in configure.ac's AH_BOTTOM

[Glenn Morris]

Juanma Barranquero wrote:

> Are you suggesting moving s/ms-32.h into nt/config.nt (this I get),

Yes.

> and then *not* including src/conf_post.h from nt/config.nt?

No.

> Because otherwise adding s/ms-w32.h at the end of nt/config.nt will
> reverse the current order between conf_post.h and ms-w32.h.

You have complete freedom to include ms-w32.h at whatever point you
like. It needs to be earlier than it is now if you want to define away
the alloca.h business cleanly. The position it ends up in has no
relevance to or effect on any non-Windows platform.


*** nt/config.nt        2012-07-29 16:56:18 +0000
--- nt/config.nt        2012-07-31 22:46:59 +0000
***************
*** 1483,1491 ****
     declarations. Define as empty for no equivalent. */
  #undef __restrict_arr
  
- /* Define to the used os dependent file. */
- #define config_opsysfile "s/ms-w32.h"
- 
  /* A replacement for va_copy, if needed.  */
  #define gl_va_copy(a,b) ((a) = (b))
  
--- 1483,1488 ----
***************
*** 1586,1593 ****
  #undef vfork
  
  
! /* Not valid on Windows.  */
! #if 0
  /* On AIX 3 this must be included before any other include file.  */
  #include <alloca.h>
  #if ! HAVE_ALLOCA
--- 1583,1592 ----
  #undef vfork
  
  
! /* Insert contents of s/ms-w32.h here.  .*/
! 
! 
! #ifndef WINDOWSNT
  /* On AIX 3 this must be included before any other include file.  */
  #include <alloca.h>
  #if ! HAVE_ALLOCA
***************
*** 1620,1630 ****
  
  #define subprocesses
  
- /* 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
--- 1619,1624 ----