emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r111538: Merge from gnulib.


From: Paul Eggert
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r111538: Merge from gnulib.
Date: Wed, 16 Jan 2013 09:45:39 -0800
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 111538
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2013-01-16 09:45:39 -0800
message:
  Merge from gnulib.
modified:
  ChangeLog
  lib/stdint.in.h
  m4/largefile.m4
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-01-16 06:04:58 +0000
+++ b/ChangeLog 2013-01-16 17:45:39 +0000
@@ -1,5 +1,11 @@
 2013-01-16  Paul Eggert  <address@hidden>
 
+       Merge from gnulib, incorporating:
+       2013-01-16 largefile: port better to Mac OS X 10.5
+       2013-01-15 stdint: fix build with Android's Bionic fox x86
+
+2013-01-16  Paul Eggert  <address@hidden>
+
        * configure.ac: Document that --enable-gcc-warnings emits errors.
        (Bug#13448)
 

=== modified file 'lib/stdint.in.h'
--- a/lib/stdint.in.h   2013-01-01 09:11:05 +0000
+++ b/lib/stdint.in.h   2013-01-16 17:45:39 +0000
@@ -39,7 +39,7 @@
    Ideally we should test __BIONIC__ here, but it is only defined after
    <sys/cdefs.h> has been included; hence test __ANDROID__ instead.  */
 #if defined __ANDROID__ \
-    && defined _SYS_TYPES_H_ && !defined _SSIZE_T_DEFINED_
+    && defined _SYS_TYPES_H_ && !defined __need_size_t
 # @INCLUDE_NEXT@ @NEXT_STDINT_H@
 #else
 

=== modified file 'm4/largefile.m4'
--- a/m4/largefile.m4   2013-01-01 09:11:05 +0000
+++ b/m4/largefile.m4   2013-01-16 17:45:39 +0000
@@ -5,9 +5,10 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# The following implementation works around a problem in autoconf <= 2.68;
-# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5.
-m4_version_prereq([2.69], [] ,[
+# The following implementation works around a problem in autoconf <= 2.69;
+# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
+# or configures them incorrectly in some cases.
+m4_version_prereq([2.70], [] ,[
 
 # _AC_SYS_LARGEFILE_TEST_INCLUDES
 # -------------------------------
@@ -25,9 +26,9 @@
 
 
 # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE,
-#                              CACHE-VAR,
-#                              DESCRIPTION,
-#                              PROLOGUE, [FUNCTION-BODY])
+#                               CACHE-VAR,
+#                               DESCRIPTION,
+#                               PROLOGUE, [FUNCTION-BODY])
 # --------------------------------------------------------
 m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE],
 [AC_CACHE_CHECK([for $1 value needed for large files], [$3],
@@ -93,15 +94,11 @@
       [_AC_SYS_LARGEFILE_TEST_INCLUDES])
   fi
 
-  AH_VERBATIM([_DARWIN_USE_64_BIT_INODE],
-[/* Enable large inode numbers on Mac OS X.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif])
+  AC_DEFINE([_DARWIN_USE_64_BIT_INODE], [1],
+    [Enable large inode numbers on Mac OS X 10.5.])
 fi
 ])# AC_SYS_LARGEFILE
-
-])# m4_version_prereq 2.69
+])# m4_version_prereq 2.70
 
 # Enable large files on systems where this is implemented by Gnulib, not by the
 # system headers.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]