From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.bugs Subject: bug#647: 23.0.60; NSInteger changes in nsterm.h break the GNUstep build Date: Mon, 04 Aug 2008 12:05:54 -0400 Message-ID: <87ljzclq8t.fsf@stupidchicken.com> Reply-To: Chong Yidong , 647@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1217867303 10285 80.91.229.12 (4 Aug 2008 16:28:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 4 Aug 2008 16:28:23 +0000 (UTC) Cc: 647@emacsbugs.donarmstrong.com To: Yavor Doganov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Aug 04 18:29:13 2008 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1KQ2vn-0006uX-21 for geb-bug-gnu-emacs@m.gmane.org; Mon, 04 Aug 2008 18:29:11 +0200 Original-Received: from localhost ([127.0.0.1]:57464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KQ2ur-0002B5-Vx for geb-bug-gnu-emacs@m.gmane.org; Mon, 04 Aug 2008 12:28:14 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KQ2u7-0001JU-Qf for bug-gnu-emacs@gnu.org; Mon, 04 Aug 2008 12:27:27 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KQ2u5-0001HH-SP for bug-gnu-emacs@gnu.org; Mon, 04 Aug 2008 12:27:27 -0400 Original-Received: from [199.232.76.173] (port=54025 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KQ2u5-0001Gk-KB for bug-gnu-emacs@gnu.org; Mon, 04 Aug 2008 12:27:25 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:42528) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KQ2u5-0001z1-6P for bug-gnu-emacs@gnu.org; Mon, 04 Aug 2008 12:27:25 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m74GRMMO022451; Mon, 4 Aug 2008 09:27:23 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m74GF5eT018485; Mon, 4 Aug 2008 09:15:05 -0700 X-Loop: don@donarmstrong.com Resent-From: Chong Yidong Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Mon, 04 Aug 2008 16:15:04 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 647 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 647-submit@emacsbugs.donarmstrong.com id=B647.121786593816636 (code B ref 647); Mon, 04 Aug 2008 16:15:04 +0000 Original-Received: (at 647) by emacsbugs.donarmstrong.com; 4 Aug 2008 16:05:38 +0000 Original-Received: from cyd (CYD.MIT.EDU [18.115.2.24]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m74G5Y7g016630 for <647@emacsbugs.donarmstrong.com>; Mon, 4 Aug 2008 09:05:35 -0700 Original-Received: by cyd (Postfix, from userid 1000) id AF3E057E311; Mon, 4 Aug 2008 12:05:54 -0400 (EDT) X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) Resent-Date: Mon, 04 Aug 2008 12:27:27 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:19012 Archived-At: Could you apply the following patch and see if it does the right thing? It tries to detect the existence of NSInteger in configure. *** trunk/configure.in.~1.552.~ 2008-07-31 12:18:39.000000000 -0400 --- trunk/configure.in 2008-08-04 12:02:38.000000000 -0400 *************** *** 2046,2051 **** --- 2046,2055 ---- if test "${NS_IMPL_GNUSTEP}" = "yes"; then AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.]) fi + AC_TRY_COMPILE([#include ], [NSInteger i;], NS_HAVE_NSINTEGER=yes, NS_HAVE_NSINTEGER=no) + if test "${NS_HAVE_NSINTEGER}" = "yes"; then + AC_DEFINE(NS_HAVE_NSINTEGER, 1, [Define to 1 if `NSInteger' is defined.]) + fi # We also have mouse menus. HAVE_MENUS=yes fi *** trunk/configure~ 2008-08-04 12:03:19.000000000 -0400 --- trunk/configure 2008-08-04 12:03:27.000000000 -0400 *************** *** 14849,14854 **** --- 14849,14902 ---- _ACEOF fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include + int + main () + { + NSInteger i; + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + NS_HAVE_NSINTEGER=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + NS_HAVE_NSINTEGER=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "${NS_HAVE_NSINTEGER}" = "yes"; then + + cat >>confdefs.h <<\_ACEOF + #define NS_HAVE_NSINTEGER 1 + _ACEOF + + fi # We also have mouse menus. HAVE_MENUS=yes fi *** trunk/src/nsterm.h.~1.9.~ 2008-08-02 18:22:33.000000000 -0400 --- trunk/src/nsterm.h 2008-08-04 12:02:47.000000000 -0400 *************** *** 364,370 **** @end #endif ! #if defined (NS_IMPL_GNUSTEP) || ( defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4) typedef long NSInteger; typedef unsigned long NSUInteger; #endif /* NS_IMPL_GNUSTEP || (NS_IMPL_COCOA and <= 10.4) */ --- 364,370 ---- @end #endif ! #ifndef NS_HAVE_NSINTEGER typedef long NSInteger; typedef unsigned long NSUInteger; #endif /* NS_IMPL_GNUSTEP || (NS_IMPL_COCOA and <= 10.4) */