From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] /srv/bzr/emacs/trunk r109306: Use an include file in configure.ac's AH_BOTTOM Date: Tue, 31 Jul 2012 21:37:58 +0200 Message-ID: References: <83vch3eu29.fsf@gnu.org> <83sjc7et2f.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: dough.gmane.org 1343763534 30307 80.91.229.3 (31 Jul 2012 19:38:54 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Jul 2012 19:38:54 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jul 31 21:38:50 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SwIHH-0004EA-4N for ged-emacs-devel@m.gmane.org; Tue, 31 Jul 2012 21:38:47 +0200 Original-Received: from localhost ([::1]:53635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwIHG-0007fQ-DZ for ged-emacs-devel@m.gmane.org; Tue, 31 Jul 2012 15:38:46 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:58136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwIHE-0007fK-C3 for emacs-devel@gnu.org; Tue, 31 Jul 2012 15:38:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwIHD-0005sV-0c for emacs-devel@gnu.org; Tue, 31 Jul 2012 15:38:44 -0400 Original-Received: from mail-gh0-f169.google.com ([209.85.160.169]:38591) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwIHA-0005rn-Rx; Tue, 31 Jul 2012 15:38:40 -0400 Original-Received: by ghrr18 with SMTP id r18so7525094ghr.0 for ; Tue, 31 Jul 2012 12:38:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=FO6nj+DSuZqM8jSYEuoG9KyfN6gDmhqKjNjo3el1/qI=; b=DIfMc1ZxiVgfVDcYqIUDpy6qeb9C+jlko/qCLTWvEUjHwJMQ5ywV7YTeB1BgyRgEac Dprj+VPfW2kOzUp4rFEEb+NNJZG2zmlJRgV3nDYxCE6zuxkXAbpYwu5bJ7o1ZYnFDfW7 qQtLZkIszfQFEyK2LtM7Njutdx4c2H6hNpNhDSHfMkx6UzFgfbRCcjRHo6aZQtBeqHsL erFTuXJy0ZkIs26BdCgIUY33PYXkhje0TBRto+61Hpqe7UKpX04OTf4loRN2J1mgxB8I z3B29JV90S742EP3zRmpn/z77qvoFc8h7VrFIYl93QqP7rKHjPHO7Ylh/JQY625FvjqP JUPw== Original-Received: by 10.68.241.35 with SMTP id wf3mr45924951pbc.102.1343763519818; Tue, 31 Jul 2012 12:38:39 -0700 (PDT) Original-Received: by 10.143.41.21 with HTTP; Tue, 31 Jul 2012 12:37:58 -0700 (PDT) In-Reply-To: <83sjc7et2f.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.169 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:152034 Archived-At: On Tue, Jul 31, 2012 at 7:31 PM, Eli Zaretskii 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 and . */ #define TIME_WITH_SYS_TIME 1 +/* Some platforms redefine this. */ +#undef TIOCSIGSEND + /* Define to 1 if your 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 -#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 -#include - -#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 #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 #if ! HAVE_ALLOCA # error "alloca not available on this machine" #endif +#endif #ifdef SIGNAL_H_AHB #undef SIGNAL_H_AHB