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

[Juanma Barranquero]

On Tue, Jul 31, 2012 at 7:31 PM, Eli Zaretskii <address@hidden> wrote:

> So you are saying that replacing the stuff at the end of nt/config.nt
> with inclusion of conf_post.h causes compilation failures?  I wonder
> why, because conf_post.h looks like an identical copy of that stuff,
> and comes at the same place.

Except for alloca.h.

> The alloca.h stuff is already #ifdef'ed away on config.nt, so it's not
> new.  Either ifdef it in conf_post.h, or provide alloca.h in nt/inc.

I'm glad we agree, as that what I proposed. But adding "#ifndef
WINDOWSNT / #endif" around the alloca.h include does not work while
compiling the lib/ sources.

With the attached patch, after "cd nt; configure ...; make" I get

In file included from ../src/config.h:1621:0,
                 from c-ctype.c:18:
../src/conf_post.h:32:20: fatal error: alloca.h: No such file or directory
compilation terminated.
make[1]: *** [oo-spd/i386/c-ctype.o] Error 1
make[1]: Leaving directory `C:/Devel/emacs/repo/trunk/lib'
make: *** [all-other-dirs-gmake] Error 2

    Juanma



=== modified file 'nt/config.nt'
--- nt/config.nt        2012-07-29 16:56:18 +0000
+++ nt/config.nt        2012-07-31 19:32:11 +0000
@@ -1257,6 +1257,9 @@
 /* Make process_send_signal work by "typing" a signal character on the pty. */
 #undef SIGNALS_VIA_CHARACTERS

+/* Define if AH_BOTTOM should include signal.h. */
+#undef SIGNAL_H_AHB
+
 /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
    'sig_atomic_t'. */
 #undef SIG_ATOMIC_T_SUFFIX
@@ -1306,6 +1309,9 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #define TIME_WITH_SYS_TIME 1

+/* Some platforms redefine this. */
+#undef TIOCSIGSEND
+
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME

@@ -1353,6 +1359,9 @@
 /* Define if the system is compatible with System V. */
 #undef USG5

+/* Define if the system is compatible with System V Release 4. */
+#undef USG5_4
+
 /* Define for USG systems where it works to open a pty's tty in the parent
    process, then close and reopen it in the child. */
 #undef USG_SUBTTY_WORKS
@@ -1383,6 +1392,9 @@
 # endif
 #endif

+/* Some platforms redefine this. */
+#undef WRETCODE
+
 /* Define this to check for malloc buffer overrun. */
 #undef XMALLOC_OVERRUN_CHECK

@@ -1483,6 +1495,24 @@
    declarations. Define as empty for no equivalent. */
 #undef __restrict_arr

+/* Some platforms redefine this. */
+#undef _longjmp
+
+/* Some platforms redefine this. */
+#undef _setjmp
+
+/* Define AMPERSAND_FULL_NAME if you use the convention
+   that & in the full name stands for the login id.  */
+#undef AMPERSAND_FULL_NAME
+
+/* `subprocesses' should be defined if you want to
+   have code for asynchronous subprocesses
+   (as used in M-x compile and M-x shell).
+   Only MSDOS does not support this (it overrides
+   this in its config_opsysfile below).  */
+
+#define subprocesses
+
 /* Define to the used os dependent file. */
 #define config_opsysfile "s/ms-w32.h"

@@ -1585,104 +1615,10 @@
 /* Define as `fork' if `vfork' does not work. */
 #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
-# error "alloca not available on this machine"
-#endif
-#endif
-
-/* This silences a few compilation warnings on FreeBSD.  */
-#ifdef BSD_SYSTEM_AHB
-#undef BSD_SYSTEM_AHB
-#undef BSD_SYSTEM
-#if __FreeBSD__ == 1
-#define BSD_SYSTEM 199103
-#elif __FreeBSD__ == 2
-#define BSD_SYSTEM 199306
-#elif __FreeBSD__ >= 3
-#define BSD_SYSTEM 199506
-#endif
-#endif
-
-/* Define AMPERSAND_FULL_NAME if you use the convention
-   that & in the full name stands for the login id.  */
-#undef AMPERSAND_FULL_NAME
-
-/* `subprocesses' should be defined if you want to
-   have code for asynchronous subprocesses
-   (as used in M-x compile and M-x shell).
-   Only MSDOS does not support this (it overrides
-   this in its config_opsysfile below).  */
-
-#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
-#if defined NS_IMPL_GNUSTEP
-#  define SYSTEM_PURESIZE_EXTRA 30000
-#elif defined DARWIN_OS
-#  define SYSTEM_PURESIZE_EXTRA 200000
-#endif
-#endif
-
-#ifdef emacs /* Don't do this for lib-src.  */
-/* Tell regex.c to use a type compatible with Emacs.  */
-#define RE_TRANSLATE_TYPE Lisp_Object
-#define RE_TRANSLATE(TBL, C) CHAR_TABLE_TRANSLATE (TBL, C)
-#ifdef make_number
-/* If make_number is a macro, use it.  */
-#define RE_TRANSLATE_P(TBL) (!EQ (TBL, make_number (0)))
-#else
-/* If make_number is a function, avoid it.  */
-#define RE_TRANSLATE_P(TBL) (!(INTEGERP (TBL) && XINT (TBL) == 0))
-#endif
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-
-#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
-
-#define ATTRIBUTE_CONST _GL_ATTRIBUTE_CONST
-
-/* Some versions of GNU/Linux define noinline in their headers.  */
-#ifdef noinline
-#undef noinline
-#endif
+/* Some platforms redefine this. */
+#undef wait3
+
+#include <conf_post.h>

 #endif /* EMACS_CONFIG_H */


=== modified file 'src/conf_post.h'
--- src/conf_post.h     2012-07-31 18:34:26 +0000
+++ src/conf_post.h     2012-07-31 19:33:28 +0000
@@ -27,11 +27,13 @@

 /* Code: */

+#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