Changeset 4285Tweet

Timestamp:

Jan 20, 2010, 8:59:01 AM (7 years ago)

Author:

sam

Message:

Improve the OpenSolaris? port: support for FILE structures, and a few
additional defines to activate libc features.

Location:

zzuf/trunk

Files:

• configure.ac (modified) (4 diffs)
• msvc/config.h (modified) (1 diff)
• src/libzzuf/lib-fd.c (modified) (1 diff)
• src/libzzuf/lib-signal.c (modified) (1 diff)
• src/libzzuf/lib-stream.c (modified) (3 diffs)

zzuf/trunk/configure.ac

@@ -93 +93 @@
 AC_TRY_COMPILE([#include <stdio.h>],
  [FILE *fp; fp->_IO_read_ptr++; fp->_IO_read_end++],
- [ac_cv_have_file_io_read_ptr=yes],
- [ac_cv_have_file_io_read_ptr=no])
-AC_MSG_RESULT($ac_cv_have_file_io_read_ptr)
-if test "$ac_cv_have_file_io_read_ptr" != "no"; then
+ [ac_cv_have_glibc_file=yes],
+ [ac_cv_have_glibc_file=no])
+AC_MSG_RESULT($ac_cv_have_glibc_file)
+if test "$ac_cv_have_glibc_file" != "no"; then
   AC_DEFINE(HAVE_GLIBC_FILE, 1, [Define to 1 if FILE has glibc-style members])
 fi
@@ -103 +103 @@
 AC_TRY_COMPILE([#include <stdio.h>],
  [FILE *fp; fp->_bf._base++; fp->_r++; fp->_p++],
- [ac_cv_have_file_bf_base=yes],
- [ac_cv_have_file_bf_base=no])
-AC_MSG_RESULT($ac_cv_have_file_bf_base)
-if test "$ac_cv_have_file_bf_base" != "no"; then
+ [ac_cv_have_freebsd_file=yes],
+ [ac_cv_have_freebsd_file=no])
+AC_MSG_RESULT($ac_cv_have_freebsd_file)
+if test "$ac_cv_have_freebsd_file" != "no"; then
   AC_DEFINE(HAVE_FREEBSD_FILE, 1, [Define to 1 if FILE has FreeBSD-style members])
+fi
+
+AC_MSG_CHECKING([for _base, _cnt and _ptr in FILE (Solaris-style)])
+AC_TRY_COMPILE([#include <stdio.h>],
+ [FILE *fp; fp->_base++; fp->_cnt++; fp->_ptr++],
+ [ac_cv_have_solaris_file=yes],
+ [ac_cv_have_solaris_file=no])
+AC_MSG_RESULT($ac_cv_have_solaris_file)
+if test "$ac_cv_have_solaris_file" != "no"; then
+  AC_DEFINE(HAVE_SOLARIS_FILE, 1, [Define to 1 if FILE has Solaris-style members])
 fi
 
@@ -115 +125 @@
 AC_TRY_COMPILE(
  [#define _LARGEFILE64_SOURCE
+  #define _LARGEFILE_SOURCE
   #include <stdio.h>],
  [fpos64_t x; long long int y = x.__pos;],
@@ -120 +131 @@
 AC_TRY_COMPILE(
  [#define _LARGEFILE64_SOURCE
+  #define _LARGEFILE_SOURCE
   #include <stdio.h>],
  [fpos64_t x; long long int y = (long long int)x;],

zzuf/trunk/msvc/config.h

@@ -83 +83 @@
 #define HAVE_SOCKET 1
 /* #undef HAVE_SOCKLEN_T */
+/* #undef HAVE_SOLARIS_FILE */
 #define HAVE_STDINT_H 1
 #define HAVE_STDLIB_H 1

zzuf/trunk/src/libzzuf/lib-fd.c

@@ -25 +25 @@
 /* Use this to get lseek64() on glibc systems */
 #define _LARGEFILE64_SOURCE
+/* Use this to get off64_t() on Solaris systems */
+#define _LARGEFILE_SOURCE
 /* Use this to get proper prototypes on HP-UX systems */
 #define _XOPEN_SOURCE_EXTENDED

zzuf/trunk/src/libzzuf/lib-signal.c

@@ -21 +21 @@
 /* Needed for struct sigaction on HP-UX */
 #define _INCLUDE_POSIX_SOURCE
+/* Needed for struct sigaction on OpenSolaris */
+#define __EXTENSIONS__
 
 #if defined HAVE_STDINT_H

zzuf/trunk/src/libzzuf/lib-stream.c

@@ -171 +171 @@
 #elif defined HAVE_FREEBSD_FILE
     return (uint8_t *)stream->_p;
+#elif defined HAVE_SOLARIS_FILE
+    return (uint8_t *)stream->_ptr;
 #else
     (void)stream;
@@ -184 +186 @@
 #elif defined HAVE_FREEBSD_FILE
     return (int)((uint8_t *)stream->_p - (uint8_t *)stream->_bf._base);
+#elif defined HAVE_SOLARIS_FILE
+    return (int)((uint8_t *)stream->_ptr - (uint8_t *)stream->_base);
 #else
     (void)stream;
@@ -197 +201 @@
 #elif defined HAVE_FREEBSD_FILE
     return stream->_r;
+#elif defined HAVE_SOLARIS_FILE
+    return stream->_cnt;
 #else
     (void)stream;