Add tentative support for Solaris/AMD64.

diff --git a/ChangeLog b/ChangeLog
index db9f1f9db14763ccebeedc885ca748a5db1d1763..6e1d8ea9b13e1d43b56e54558f4a7fcc01c9eb01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-19  Bruno Haible  <bruno@clisp.org>
+
+       * lib/fbufmode.c (fbufmode): Add tentative support for Solaris/AMD64.
+       * lib/fseeko.c (rpl_fseeko): Likewise.
+       * lib/fseterr.c (fseterr): Likewise.
+
 2007-08-19  Bruno Haible  <bruno@clisp.org>
 
        * tests/test-lseek.c (main): Disable a test for BeOS.

diff --git a/lib/fbufmode.c b/lib/fbufmode.c
index 58c3bc247a418d52b39dcb5e0c65e7e8e0121a41..1c66a53784cddf725896e5ff55f97d9299568e3e 100644 (file)
--- a/lib/fbufmode.c
+++ b/lib/fbufmode.c
@@ -55,8 +55,15 @@ fbufmode (FILE *fp)
   if (fp->_flag & _IOLBF)
     return _IOLBF;
 # endif
-# if defined __sun && defined __sparc && defined _LP64 /* Solaris/SPARC 64-bit */
-  return ((unsigned int *) fp) [9] & (_IONBF | _IOFBF);
+# if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */
+#  define fp_ ((struct { unsigned char *_ptr; \
+                        unsigned char *_base; \
+                        unsigned char *_end; \
+                        long _cnt; \
+                        int _file; \
+                        unsigned int _flag; \
+                      } *) fp)
+  return fp_->_flag & (_IONBF | _IOFBF);
 # else
   if (fp->_flag & _IONBF)
     return _IONBF;

diff --git a/lib/fseeko.c b/lib/fseeko.c
index 1b51f88f1b72b001139b61335d40e1fdcbdcd82b..209ce9c69073ae247f383309e5161bbd66f3c0c7 100644 (file)
--- a/lib/fseeko.c
+++ b/lib/fseeko.c
@@ -71,11 +71,13 @@ rpl_fseeko (FILE *fp, off_t offset, int whence)
                    : 0)
       && fp_ub._base == NULL)
 #elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, mingw */
-# if defined __sun && defined __sparc && defined _LP64 /* Solaris/SPARC 64-bit */
+# if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */
 #  define fp_ ((struct { unsigned char *_ptr; \
                         unsigned char *_base; \
                         unsigned char *_end; \
                         long _cnt; \
+                        int _file; \
+                        unsigned int _flag; \
                       } *) fp)
   if (fp_->_ptr == fp_->_base
       && (fp_->_ptr == NULL || fp_->_cnt == 0))

diff --git a/lib/fseterr.c b/lib/fseterr.c
index d0137428b3776dc8ec8d6e5289b41df7835ee279..d8ea1fbb299625570af7cbaff3b8ec16d0587e97 100644 (file)
--- a/lib/fseterr.c
+++ b/lib/fseterr.c
@@ -33,8 +33,15 @@ fseterr (FILE *fp)
 #elif defined __sferror             /* FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */
   fp->_flags |= __SERR;
 #elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, mingw */
-# if defined __sun && defined __sparc && defined _LP64 /* Solaris/SPARC 64-bit */
-  ((unsigned int *) fp) [9] |= _IOERR;
+# if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */
+#  define fp_ ((struct { unsigned char *_ptr; \
+                        unsigned char *_base; \
+                        unsigned char *_end; \
+                        long _cnt; \
+                        int _file; \
+                        unsigned int _flag; \
+                      } *) fp)
+  fp_->_flag |= _IOERR;
 # else
   fp->_flag |= _IOERR;
 # endif