Makefile.in: Update config.h dependencies.

2001-07-07  Toon Moene  <toon@moene.indiv.nluug.nl>

	* libI77/Makefile.in: Update config.h dependencies.
	* libI77/configure.in: Define _XOPEN_SOURCE and
	_FILE_OFFSET_BITS unconditionally.
	* libI77/configure: Rebuilt.
	* libI77/config.h.in: Rebuilt.
	* libI77/endfile.c (t_runc): Replace rewind by FSEEK.
	* libI77/err.c (f__nowwriting): The type of `loc' is off_t.
	* libI77/open.c (f_open): Replace rewind by FSEEK.
	* libI77/rewind.c: Include config.h.  (f_rew): Replace
	rewind by FSEEK.
	* libI77/sfe.c: Include config.h.
	* libI77/wsfe.c: Ditto.
	* libU77/configure.in: Define _XOPEN_SOURCE and
	_FILE_OFFSET_BITS unconditionally.
	* libU77/configure: Rebuilt.
	* libU77/config.hin: Rebuilt.

From-SVN: r43841

diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index 3b93925d9cfd9140b4b33908b0ed0c7f06054529..906d430b12938922f05af87029fbc8eea45902ff 100644 (file)
--- a/libf2c/ChangeLog
+++ b/libf2c/ChangeLog
@@ -1,3 +1,22 @@
+2001-07-07  Toon Moene  <toon@moene.indiv.nluug.nl>
+
+       * libI77/Makefile.in: Update config.h dependencies.
+       * libI77/configure.in: Define _XOPEN_SOURCE and
+       _FILE_OFFSET_BITS unconditionally.
+       * libI77/configure: Rebuilt.
+       * libI77/config.h.in: Rebuilt.
+       * libI77/endfile.c (t_runc): Replace rewind by FSEEK.
+       * libI77/err.c (f__nowwriting): The type of `loc' is off_t.
+       * libI77/open.c (f_open): Replace rewind by FSEEK.
+       * libI77/rewind.c: Include config.h.  (f_rew): Replace
+       rewind by FSEEK.
+       * libI77/sfe.c: Include config.h.
+       * libI77/wsfe.c: Ditto.
+       * libU77/configure.in: Define _XOPEN_SOURCE and
+       _FILE_OFFSET_BITS unconditionally.
+       * libU77/configure: Rebuilt.
+       * libU77/config.hin: Rebuilt.
+
 2001-07-07  Toon Moene  <toon@moene.indiv.nluug.nl>
 
        * libI77/Makefile.in: Add necessary dependencies on config.h.

diff --git a/libf2c/libI77/Makefile.in b/libf2c/libI77/Makefile.in
index 28bfa34cee8bae87c2523206b00992e2c5e8079c..8cccf8550c96218dcc7f7a81fcdede7ad5f2b6fa 100644 (file)
--- a/libf2c/libI77/Makefile.in
+++ b/libf2c/libI77/Makefile.in
@@ -124,14 +124,14 @@ open.o:           open.c fio.h rawio.h config.h
 rdfmt.o:       fio.h config.h
 rdfmt.o:       fmt.h
 rdfmt.o:       rdfmt.c fp.h
-rewind.o:      rewind.c fio.h
+rewind.o:      rewind.c fio.h config.h
 rsfe.o:                fio.h config.h
 rsfe.o:                rsfe.c fmt.h
 rsli.o:                fio.h
 rsli.o:                rsli.c lio.h
 rsne.o:                fio.h config.h
 rsne.o:                rsne.c lio.h
-sfe.o:         sfe.c fio.h
+sfe.o:         sfe.c fio.h config.h
 sue.o:         sue.c fio.h config.h
 typesize.o:    typesize.c config.h
 uio.o:         uio.c fio.h
@@ -141,7 +141,7 @@ wref.o:             fmt.h
 wref.o:                wref.c fp.h
 wrtfmt.o:      fio.h config.h
 wrtfmt.o:      wrtfmt.c fmt.h
-wsfe.o:                fio.h
+wsfe.o:                fio.h config.h
 wsfe.o:                wsfe.c fmt.h
 wsle.o:                fio.h config.h
 wsle.o:                fmt.h

diff --git a/libf2c/libI77/config.h.in b/libf2c/libI77/config.h.in
index 9bd85163b18e59abd3cab08b4c6359d90450b102..c784d105f6e937db4f5da61bfbfce3827f0e9a48 100644 (file)
--- a/libf2c/libI77/config.h.in
+++ b/libf2c/libI77/config.h.in
@@ -51,3 +51,9 @@
 /* Define to skip f2c undefs. */
 #undef Skip_f2c_Undefs
 
+/* Get Single Unix Specification semantics */
+#undef _XOPEN_SOURCE
+
+/* Get 64-bit file size support */
+#undef _FILE_OFFSET_BITS
+

diff --git a/libf2c/libI77/configure b/libf2c/libI77/configure
index d44e657e59c81c31d29a8ca2028c9e18d17594b3..8defe25d1d191bd492aa29e051f83088febb46d5 100755 (executable)
--- a/libf2c/libI77/configure
+++ b/libf2c/libI77/configure
@@ -1706,6 +1706,17 @@ cat >> confdefs.h <<\EOF
 EOF
 
 
+# These defines are necessary to get 64-bit file size support.
+
+cat >> confdefs.h <<\EOF
+#define _XOPEN_SOURCE 500L
+EOF
+
+cat >> confdefs.h <<\EOF
+#define _FILE_OFFSET_BITS 64
+EOF
+
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure

diff --git a/libf2c/libI77/configure.in b/libf2c/libI77/configure.in
index de38d6d635d23c0d071db3ea853d1957b203d4a0..5ac1b622361d7e4e008109cae256537e1e391063 100644 (file)
--- a/libf2c/libI77/configure.in
+++ b/libf2c/libI77/configure.in
@@ -201,6 +201,11 @@ AC_TYPE_OFF_T
 
 AC_DEFINE(Skip_f2c_Undefs, 1, [Define to skip f2c undefs.])
 
+# These defines are necessary to get 64-bit file size support.
+
+AC_DEFINE(_XOPEN_SOURCE, 500L, [Get Single Unix Specification semantics])
+AC_DEFINE(_FILE_OFFSET_BITS, 64, [Get 64-bit file size support])
+
 AC_OUTPUT(Makefile)
 
 dnl We might have configuration options to:

diff --git a/libf2c/libI77/endfile.c b/libf2c/libI77/endfile.c
index 859eb314f4dae35bbd703be59e99bd7b39d34417..14b51f043c4a92800e2fc2dae4d2cfa825715320 100644 (file)
--- a/libf2c/libI77/endfile.c
+++ b/libf2c/libI77/endfile.c
@@ -111,7 +111,7 @@ t_runc(alist *a)
                }
        if (!(bf = freopen(b->ufnm, f__w_mode[0], bf)))
                goto bad1;
-       rewind(tf);
+       FSEEK(tf, 0, SEEK_SET);
        if (copy(tf, loc, bf))
                goto bad1;
        b->uwrt = 1;

diff --git a/libf2c/libI77/err.c b/libf2c/libI77/err.c
index 5cafab70734933c7b147f051af55119f040f2340..1c21f198cdbc7e97885a5a83540a03b8861cf6ad 100644 (file)
--- a/libf2c/libI77/err.c
+++ b/libf2c/libI77/err.c
@@ -241,7 +241,7 @@ f__nowwriting(x) unit *x;
 f__nowwriting(unit *x)
 #endif
 {
-       long loc;
+       off_t loc;
        int ufmt;
        extern char *f__w_mode[];
 

diff --git a/libf2c/libI77/open.c b/libf2c/libI77/open.c
index e28faafbdcc8d15bbcc7cca3942e51a9c0194151..75c8971b7b7a6f8157bd789bb746121cd31ef826 100644 (file)
--- a/libf2c/libI77/open.c
+++ b/libf2c/libI77/open.c
@@ -281,7 +281,7 @@ integer f_open(olist *a)
 #endif
        if(b->useek)
                if (a->orl)
-                       rewind(b->ufd);
+                       FSEEK(b->ufd, 0, SEEK_SET);
                else if ((s = a->oacc) && (*s == 'a' || *s == 'A')
                        && FSEEK(b->ufd, 0, SEEK_END))
                                opnerr(a->oerr,129,"open");

diff --git a/libf2c/libI77/rewind.c b/libf2c/libI77/rewind.c
index 9ba4b239f328a62137b0ef4dcf192e5bf7955167..06915195d67030190a8fb263b05df4055ccc4c07 100644 (file)
--- a/libf2c/libI77/rewind.c
+++ b/libf2c/libI77/rewind.c
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "f2c.h"
 #include "fio.h"
 #ifdef KR_headers
@@ -20,7 +21,7 @@ integer f_rew(alist *a)
                (void) t_runc(a);
                b->uwrt = 3;
                }
-       rewind(b->ufd);
+       FSEEK(b->ufd, 0, SEEK_SET);
        b->uend=0;
        return(0);
 }

diff --git a/libf2c/libI77/sfe.c b/libf2c/libI77/sfe.c
index 77ade5b5a7f59f28701fd1778b4957a2bea7bf5d..b67d823cf7c6015ef9cad7eaefb3b2b2b8e93f57 100644 (file)
--- a/libf2c/libI77/sfe.c
+++ b/libf2c/libI77/sfe.c
@@ -1,4 +1,5 @@
 /* sequential formatted external common routines*/
+#include "config.h"
 #include "f2c.h"
 #include "fio.h"
 

diff --git a/libf2c/libI77/wsfe.c b/libf2c/libI77/wsfe.c
index babfb3479d9a5b95d753d576f13a894d47ba8348..490231ac75ad37b749ce4a230c30196d5fa19acf 100644 (file)
--- a/libf2c/libI77/wsfe.c
+++ b/libf2c/libI77/wsfe.c
@@ -1,4 +1,5 @@
 /*write sequential formatted external*/
+#include "config.h"
 #include "f2c.h"
 #include "fio.h"
 #include "fmt.h"

diff --git a/libf2c/libU77/config.hin b/libf2c/libU77/config.hin
index 19f5399d5385733c9c47506fcdca603c061ba9d5..d0fc0adf6587d673e2701db846bef3839680e6a7 100644 (file)
--- a/libf2c/libU77/config.hin
+++ b/libf2c/libU77/config.hin
@@ -110,3 +110,10 @@
 
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
+
+/* Get Single Unix Specification semantics */
+#undef _XOPEN_SOURCE
+
+/* Get 64-bit file size support */
+#undef _FILE_OFFSET_BITS
+

diff --git a/libf2c/libU77/configure b/libf2c/libU77/configure
index 713704226c0419a56deade6cba7619de80e9b8d4..e0095463ae744d162645448fb7f8b33f8a6fa1c1 100755 (executable)
--- a/libf2c/libU77/configure
+++ b/libf2c/libU77/configure
@@ -1060,7 +1060,7 @@ else
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
+typedef int charset[2]; const charset x = {0,0};
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
@@ -1652,6 +1652,18 @@ test $ac_cv_func_clock = yes && MAYBES="$MAYBES mclock_.o"
 
 
 
+
+# These defines are necessary to get 64-bit file size support.
+
+cat >> confdefs.h <<\EOF
+#define _XOPEN_SOURCE 500L
+EOF
+
+cat >> confdefs.h <<\EOF
+#define _FILE_OFFSET_BITS 64
+EOF
+
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure

diff --git a/libf2c/libU77/configure.in b/libf2c/libU77/configure.in
index 03bfe660a5174853adb2a21cfdbf80f201fae7a5..d5cecee4185a5a0b82c30f99169cb4dd70f4dd98 100644 (file)
--- a/libf2c/libU77/configure.in
+++ b/libf2c/libU77/configure.in
@@ -107,4 +107,10 @@ AC_SUBST(MAYBES)
 AC_SUBST(CROSS)
 AC_SUBST(RANLIB)
 AC_SUBST(RANLIB_TEST)
+
+# These defines are necessary to get 64-bit file size support.
+
+AC_DEFINE(_XOPEN_SOURCE, 500L, [Get Single Unix Specification semantics])
+AC_DEFINE(_FILE_OFFSET_BITS, 64, [Get 64-bit file size support])
+
 AC_OUTPUT(Makefile)