[Emacs-diffs] /srv/bzr/emacs/trunk r104061: Adapt the MSDOS build to changes in revno 104021.

[Eli Zaretskii]

------------------------------------------------------------
revno: 104061 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-04-30 13:35:16 +0300
message:
  Adapt the MSDOS build to changes in revno 104021.
  
   msdos/inttypes.h: New file.
   msdos/sed2v2.inp (HAVE_DECL_STRTOULL, HAVE_DECL_STRTOUMAX)
   (HAVE_STRTOULL, HAVE_STRTOULL): Define to 1.
   msdos/sedlibmk.inp (BUILT_SOURCES): Edit out inttypes.h.
   msdos/sed1v2.inp (CPPFLAGS): Edit to "-I../msdos".
   Add ../msdos/inttypes.h to prerequisites of lread.o.
   src/dosfns.c (Fint86, Fdos_memget, Fdos_memput): Use `ASIZE (FOO)'
   rather than `XVECTOR (FOO)->size'.
added:
  msdos/inttypes.h
modified:
  msdos/ChangeLog
  msdos/sed1v2.inp
  msdos/sed2v2.inp
  msdos/sedlibmk.inp
  src/ChangeLog
  src/dosfns.c

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2011-04-24 12:48:30 +0000
+++ b/msdos/ChangeLog   2011-04-30 10:31:17 +0000
@@ -1,3 +1,15 @@
+2011-04-30  Eli Zaretskii  <address@hidden>
+
+       * inttypes.h: New file.
+
+       * sed2v2.inp (HAVE_DECL_STRTOULL, HAVE_DECL_STRTOUMAX)
+       (HAVE_STRTOULL, HAVE_STRTOULL): Define to 1.
+
+       * sedlibmk.inp (BUILT_SOURCES): Edit out inttypes.h.
+
+       * sed1v2.inp (CPPFLAGS): Edit to "-I../msdos".
+       Add ../msdos/inttypes.h to prerequisites of lread.o.
+
 2011-04-24  Eli Zaretskii  <address@hidden>
 
        * sedlibmk.inp (am_libgnu_a_OBJECTS): Edit out

=== added file 'msdos/inttypes.h'
--- a/msdos/inttypes.h  1970-01-01 00:00:00 +0000
+++ b/msdos/inttypes.h  2011-04-30 10:31:17 +0000
@@ -0,0 +1,31 @@
+/* Replacement inntypes.h file for building GNU Emacs on MS-DOS with DJGPP.
+
+Copyright (C) 2011  Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _REPL_INTTYPES_H
+#define _REPL_INTTYPES_H
+
+#if __DJGPP__ > 2 || __DJGPP_MINOR__ >= 4
+#include_next <inttypes.h>
+#else  /* __DJGPP__ < 2.04 */
+#include <stdlib.h>
+#define uintmax_t unsigned long long
+#define strtoumax strtoull
+#endif /* __DJGPP__ < 2.04 */
+
+#endif

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2011-02-19 19:49:10 +0000
+++ b/msdos/sed1v2.inp  2011-04-30 10:31:17 +0000
@@ -28,7 +28,8 @@
 /^CPP *=/s/@address@hidden@/gcc -e/
 /^CFLAGS *=/s/@address@hidden@/-O2 -gcoff/
 /^ALL_CFLAGS *=/s/@address@hidden@//g
-/^CPPFLAGS *=/s/@address@hidden@//
+/^ALL_CFLAGS *=/s/ -I\.//g
+/^CPPFLAGS *=/s|@address@hidden@|-I../msdos|
 /^LDFLAGS *=/s/@address@hidden@//
 /^LD_FIRSTFLAG *=/s/@address@hidden@//
 /^LIBS *=/s/@address@hidden@//
@@ -193,3 +194,5 @@
 s/ \$(C_SWITCH_X_SITE)//
 s/ \$(DBUS_CFLAGS)//
 s| -I\$(srcdir)/../lib||
+# Add our local inttypes.h to prerequisites where needed
+/^lread\.o:/s|lread\.c|& ../msdos/inttypes.h|

=== modified file 'msdos/sed2v2.inp'
--- a/msdos/sed2v2.inp  2011-02-26 12:55:10 +0000
+++ b/msdos/sed2v2.inp  2011-04-30 10:31:17 +0000
@@ -100,6 +100,10 @@
 #else\
 #undef HAVE_STDINT_H\
 #endif
+s/^#undef HAVE_DECL_STRTOULL *$/#define HAVE_DECL_STRTOULL 1/
+s/^#undef HAVE_DECL_STRTOUMAX *$/#define HAVE_DECL_STRTOUMAX 1/
+s/^#undef HAVE_STRTOULL *$/#define HAVE_STRTOULL 1/
+s/^#undef HAVE_STRTOULL *$/#define HAVE_STRTOULL 1/
 
 # Comment out any remaining undef directives, because some of them
 # might be defined in sys/config.h we include at the top of config.h.

=== modified file 'msdos/sedlibmk.inp'
--- a/msdos/sedlibmk.inp        2011-04-24 12:48:30 +0000
+++ b/msdos/sedlibmk.inp        2011-04-30 10:31:17 +0000
@@ -515,8 +515,9 @@
 /^WCHAR_T_SUFFIX *=/s/@WCHAR_T_SUFFIX@/h/
 /^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@//
 /^gl_LIBOBJS *=/s/@address@hidden@/getopt.o getopt1.o strftime.o time_r.o 
getloadavg.o md5.o filemode.o/
-/^am_libgnu_a_OBJECTS *=/s/careadlinkat.\$(OBJEXT)//
-/^am_libgnu_a_OBJECTS *=/s/allocator.\$(OBJEXT)//
+/^BUILT_SOURCES *=/s/ *inttypes\.h//
+/^am_libgnu_a_OBJECTS *=/s/careadlinkat\.\$(OBJEXT)//
+/^am_libgnu_a_OBJECTS *=/s/allocator\.\$(OBJEXT)//
 /^srcdir *=/s/@address@hidden@/./
 /^top_srcdir *=/s/@address@hidden@/../
 /^top_builddir *=/s/@address@hidden@/../

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-04-30 09:31:01 +0000
+++ b/src/ChangeLog     2011-04-30 10:31:17 +0000
@@ -1,5 +1,8 @@
 2011-04-30  Eli Zaretskii  <address@hidden>
 
+       * dosfns.c (Fint86, Fdos_memget, Fdos_memput): Use `ASIZE (FOO)'
+       rather than `XVECTOR (FOO)->size'.
+
        * process.c: Remove HAVE_INTTYPES_H condition from inclusion of
        inttypes.h, as a gnulib replacement is used if it not available in
        system headers.

=== modified file 'src/dosfns.c'
--- a/src/dosfns.c      2011-01-25 04:08:28 +0000
+++ b/src/dosfns.c      2011-04-30 10:31:17 +0000
@@ -62,7 +62,7 @@
   CHECK_NUMBER (interrupt);
   no = (unsigned long) XINT (interrupt);
   CHECK_VECTOR (registers);
-  if (no < 0 || no > 0xff || XVECTOR (registers)-> size != 8)
+  if (no < 0 || no > 0xff || ASIZE (registers) != 8)
     return Qnil;
   for (i = 0; i < 8; i++)
     CHECK_NUMBER (XVECTOR (registers)->contents[i]);
@@ -102,7 +102,7 @@
   CHECK_NUMBER (address);
   offs = (unsigned long) XINT (address);
   CHECK_VECTOR (vector);
-  len = XVECTOR (vector)-> size;
+  len = ASIZE (vector);
   if (len < 1 || len > 2048 || offs < 0 || offs > 0xfffff - len)
     return Qnil;
   buf = alloca (len);
@@ -125,7 +125,7 @@
   CHECK_NUMBER (address);
   offs = (unsigned long) XINT (address);
   CHECK_VECTOR (vector);
-  len = XVECTOR (vector)-> size;
+  len = ASIZE (vector);
   if (len < 1 || len > 2048 || offs < 0 || offs > 0xfffff - len)
     return Qnil;
   buf = alloca (len);