From 771d71208598fc6bcc41972767cb4672ce70a9be Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Wed, 17 Mar 1999 09:46:59 +0000 Subject: [PATCH] Added missing values for G_MAXU(SHORT|INT|LONG) on platforms with only 1999-03-17 Sebastian Wilhelmi * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on platforms with only /usr/include/values.h. * acconfig.h: Removed unnecessary macros. * glibconfig.h.win32, config.h.win32: Moved G_THREADS_IMPL_POSIX from config.h.win32 to glibconfig.h.win32. Taken from glib 1.2 branch. * configure.in: Also accept _Pctime_r instead of ctime_r, while seraching for the right `_REENTRANT' flag. This is for Digital UNIX 4.0d. Taken from glib 1.2 branch. --- ChangeLog | 15 +++++++++++++++ ChangeLog.pre-2-0 | 15 +++++++++++++++ ChangeLog.pre-2-10 | 15 +++++++++++++++ ChangeLog.pre-2-12 | 15 +++++++++++++++ ChangeLog.pre-2-2 | 15 +++++++++++++++ ChangeLog.pre-2-4 | 15 +++++++++++++++ ChangeLog.pre-2-6 | 15 +++++++++++++++ ChangeLog.pre-2-8 | 15 +++++++++++++++ acconfig.h | 3 --- config.h.win32 | 2 -- configure.in | 9 +++++---- glibconfig.h.win32 | 1 + 12 files changed, 126 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c34bb5..bc50542 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +1999-03-17 Sebastian Wilhelmi + + * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on + platforms with only /usr/include/values.h. + + * acconfig.h: Removed unnecessary macros. + + * glibconfig.h.win32, config.h.win32: Moved G_THREADS_IMPL_POSIX + from config.h.win32 to glibconfig.h.win32. Taken from glib 1.2 + branch. + + * configure.in: Also accept _Pctime_r instead of ctime_r, while + seraching for the right `_REENTRANT' flag. This is for Digital + UNIX 4.0d. Taken from glib 1.2 branch. + Wed Mar 17 03:14:56 1999 Tim Janik * glib.h: added GLIB_CHECK_VERSION() macro similar to diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9c34bb5..bc50542 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,18 @@ +1999-03-17 Sebastian Wilhelmi + + * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on + platforms with only /usr/include/values.h. + + * acconfig.h: Removed unnecessary macros. + + * glibconfig.h.win32, config.h.win32: Moved G_THREADS_IMPL_POSIX + from config.h.win32 to glibconfig.h.win32. Taken from glib 1.2 + branch. + + * configure.in: Also accept _Pctime_r instead of ctime_r, while + seraching for the right `_REENTRANT' flag. This is for Digital + UNIX 4.0d. Taken from glib 1.2 branch. + Wed Mar 17 03:14:56 1999 Tim Janik * glib.h: added GLIB_CHECK_VERSION() macro similar to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9c34bb5..bc50542 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,18 @@ +1999-03-17 Sebastian Wilhelmi + + * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on + platforms with only /usr/include/values.h. + + * acconfig.h: Removed unnecessary macros. + + * glibconfig.h.win32, config.h.win32: Moved G_THREADS_IMPL_POSIX + from config.h.win32 to glibconfig.h.win32. Taken from glib 1.2 + branch. + + * configure.in: Also accept _Pctime_r instead of ctime_r, while + seraching for the right `_REENTRANT' flag. This is for Digital + UNIX 4.0d. Taken from glib 1.2 branch. + Wed Mar 17 03:14:56 1999 Tim Janik * glib.h: added GLIB_CHECK_VERSION() macro similar to diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 9c34bb5..bc50542 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,18 @@ +1999-03-17 Sebastian Wilhelmi + + * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on + platforms with only /usr/include/values.h. + + * acconfig.h: Removed unnecessary macros. + + * glibconfig.h.win32, config.h.win32: Moved G_THREADS_IMPL_POSIX + from config.h.win32 to glibconfig.h.win32. Taken from glib 1.2 + branch. + + * configure.in: Also accept _Pctime_r instead of ctime_r, while + seraching for the right `_REENTRANT' flag. This is for Digital + UNIX 4.0d. Taken from glib 1.2 branch. + Wed Mar 17 03:14:56 1999 Tim Janik * glib.h: added GLIB_CHECK_VERSION() macro similar to diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9c34bb5..bc50542 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,18 @@ +1999-03-17 Sebastian Wilhelmi + + * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on + platforms with only /usr/include/values.h. + + * acconfig.h: Removed unnecessary macros. + + * glibconfig.h.win32, config.h.win32: Moved G_THREADS_IMPL_POSIX + from config.h.win32 to glibconfig.h.win32. Taken from glib 1.2 + branch. + + * configure.in: Also accept _Pctime_r instead of ctime_r, while + seraching for the right `_REENTRANT' flag. This is for Digital + UNIX 4.0d. Taken from glib 1.2 branch. + Wed Mar 17 03:14:56 1999 Tim Janik * glib.h: added GLIB_CHECK_VERSION() macro similar to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9c34bb5..bc50542 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,18 @@ +1999-03-17 Sebastian Wilhelmi + + * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on + platforms with only /usr/include/values.h. + + * acconfig.h: Removed unnecessary macros. + + * glibconfig.h.win32, config.h.win32: Moved G_THREADS_IMPL_POSIX + from config.h.win32 to glibconfig.h.win32. Taken from glib 1.2 + branch. + + * configure.in: Also accept _Pctime_r instead of ctime_r, while + seraching for the right `_REENTRANT' flag. This is for Digital + UNIX 4.0d. Taken from glib 1.2 branch. + Wed Mar 17 03:14:56 1999 Tim Janik * glib.h: added GLIB_CHECK_VERSION() macro similar to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9c34bb5..bc50542 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,18 @@ +1999-03-17 Sebastian Wilhelmi + + * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on + platforms with only /usr/include/values.h. + + * acconfig.h: Removed unnecessary macros. + + * glibconfig.h.win32, config.h.win32: Moved G_THREADS_IMPL_POSIX + from config.h.win32 to glibconfig.h.win32. Taken from glib 1.2 + branch. + + * configure.in: Also accept _Pctime_r instead of ctime_r, while + seraching for the right `_REENTRANT' flag. This is for Digital + UNIX 4.0d. Taken from glib 1.2 branch. + Wed Mar 17 03:14:56 1999 Tim Janik * glib.h: added GLIB_CHECK_VERSION() macro similar to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9c34bb5..bc50542 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,18 @@ +1999-03-17 Sebastian Wilhelmi + + * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on + platforms with only /usr/include/values.h. + + * acconfig.h: Removed unnecessary macros. + + * glibconfig.h.win32, config.h.win32: Moved G_THREADS_IMPL_POSIX + from config.h.win32 to glibconfig.h.win32. Taken from glib 1.2 + branch. + + * configure.in: Also accept _Pctime_r instead of ctime_r, while + seraching for the right `_REENTRANT' flag. This is for Digital + UNIX 4.0d. Taken from glib 1.2 branch. + Wed Mar 17 03:14:56 1999 Tim Janik * glib.h: added GLIB_CHECK_VERSION() macro similar to diff --git a/acconfig.h b/acconfig.h index 5c6af07..c395766 100644 --- a/acconfig.h +++ b/acconfig.h @@ -53,9 +53,6 @@ #undef HAVE_LIMITS_H #undef HAVE_LONG_DOUBLE #undef HAVE_POLL -#undef HAVE_PTHREAD_COND_TIMEDWAIT_POSIX -#undef HAVE_PTHREAD_GETSPECIFIC_POSIX -#undef HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX #undef HAVE_PWD_H #undef HAVE_SYS_PARAM_H #undef HAVE_SYS_POLL_H diff --git a/config.h.win32 b/config.h.win32 index 685c253..2643bfa 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -61,8 +61,6 @@ #define GLIB_BINARY_AGE 0 #define G_THREAD_SOURCE "gthread-posix.c" -#define G_THREADS_IMPL_POSIX -#define HAVE_PTHREAD_GETSPECIFIC_POSIX 1 /* The number of bytes in a char. */ #define SIZEOF_CHAR 1 diff --git a/configure.in b/configure.in index 3df035a..f2c941b 100644 --- a/configure.in +++ b/configure.in @@ -710,7 +710,8 @@ if test x"$enable_threads" = xyes; then # not using the proper multithread flag old_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS" - AC_EGREP_HEADER([[^a-zA-Z_]ctime_r[^a-zA-Z_]], time.h, , + # Note: Digital UNIX 4.0d #defines ctime_r to _Pctime_r for gcc. + AC_EGREP_HEADER([[^a-zA-Z_](_P)?ctime_r[^a-zA-Z_]], time.h, , G_THREAD_CFLAGS= AC_MSG_WARN($FLAG_DOES_NOT_WORK)) CPPFLAGS=$old_CPPFLAGS @@ -1065,9 +1066,9 @@ x$ac_cv_header_limits_h) ;; x$ac_cv_header_values_h) glib_values_h=yes - glib_ms=MINSHORT glib_Ms=MAXSHORT glib_Mus=unknown # Please insert the right - glib_mi=MININT glib_Mi=MAXINT glib_Mui=unknown # values from - glib_ml=MINLONG glib_Ml=MAXLONG glib_Mul=unknown # /usr/include/values.h + glib_ms=MINSHORT glib_Ms=MAXSHORT glib_Mus="(((gushort)G_MAXSHORT)*2+1)" + glib_mi=MININT glib_Mi=MAXINT glib_Mui="(((guint)G_MAXINT)*2+1)" + glib_ml=MINLONG glib_Ml=MAXLONG glib_Mul="(((gulong)G_MAXLONG)*2+1)" ;; esac diff --git a/glibconfig.h.win32 b/glibconfig.h.win32 index 1f5c953..663d283 100644 --- a/glibconfig.h.win32 +++ b/glibconfig.h.win32 @@ -104,6 +104,7 @@ typedef unsigned __int64 guint64; * } */ +#define G_THREADS_IMPL_POSIX typedef struct _GStaticMutex GStaticMutex; struct _GStaticMutex { -- 2.7.4