From: Raja R Harinath Date: Sun, 14 Mar 1999 20:57:41 +0000 (+0000) Subject: Remove widechar tests and defines. (fd_set): Change the grep for `fd_mask' X-Git-Tag: GLIB_1_3_0~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bfc21756e14e4600c916c00e6ee03e1c10e0cc01;p=platform%2Fupstream%2Fglib.git Remove widechar tests and defines. (fd_set): Change the grep for `fd_mask' * configure.in (glibconfig.h): Remove widechar tests and defines. (fd_set): Change the grep for `fd_mask' to search for `fd_set'. * gerror.c (fd_mask): Remove conditional typedef. It is not used elsewhere in the file. * gmain.c (fd_mask): Likewise. --- diff --git a/ChangeLog b/ChangeLog index bb9f41d..ecde6e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1999-03-14 Raja R Harinath + + * configure.in (glibconfig.h): Remove widechar tests and defines. + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + * gerror.c (fd_mask): Remove conditional typedef. It is not used + elsewhere in the file. + * gmain.c (fd_mask): Likewise. + 1999-03-12 Sebastian Wilhelmi * configure.in: Test for posix threads first, then for dce threads. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bb9f41d..ecde6e9 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +1999-03-14 Raja R Harinath + + * configure.in (glibconfig.h): Remove widechar tests and defines. + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + * gerror.c (fd_mask): Remove conditional typedef. It is not used + elsewhere in the file. + * gmain.c (fd_mask): Likewise. + 1999-03-12 Sebastian Wilhelmi * configure.in: Test for posix threads first, then for dce threads. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bb9f41d..ecde6e9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +1999-03-14 Raja R Harinath + + * configure.in (glibconfig.h): Remove widechar tests and defines. + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + * gerror.c (fd_mask): Remove conditional typedef. It is not used + elsewhere in the file. + * gmain.c (fd_mask): Likewise. + 1999-03-12 Sebastian Wilhelmi * configure.in: Test for posix threads first, then for dce threads. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index bb9f41d..ecde6e9 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +1999-03-14 Raja R Harinath + + * configure.in (glibconfig.h): Remove widechar tests and defines. + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + * gerror.c (fd_mask): Remove conditional typedef. It is not used + elsewhere in the file. + * gmain.c (fd_mask): Likewise. + 1999-03-12 Sebastian Wilhelmi * configure.in: Test for posix threads first, then for dce threads. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bb9f41d..ecde6e9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +1999-03-14 Raja R Harinath + + * configure.in (glibconfig.h): Remove widechar tests and defines. + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + * gerror.c (fd_mask): Remove conditional typedef. It is not used + elsewhere in the file. + * gmain.c (fd_mask): Likewise. + 1999-03-12 Sebastian Wilhelmi * configure.in: Test for posix threads first, then for dce threads. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bb9f41d..ecde6e9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +1999-03-14 Raja R Harinath + + * configure.in (glibconfig.h): Remove widechar tests and defines. + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + * gerror.c (fd_mask): Remove conditional typedef. It is not used + elsewhere in the file. + * gmain.c (fd_mask): Likewise. + 1999-03-12 Sebastian Wilhelmi * configure.in: Test for posix threads first, then for dce threads. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bb9f41d..ecde6e9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +1999-03-14 Raja R Harinath + + * configure.in (glibconfig.h): Remove widechar tests and defines. + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + * gerror.c (fd_mask): Remove conditional typedef. It is not used + elsewhere in the file. + * gmain.c (fd_mask): Likewise. + 1999-03-12 Sebastian Wilhelmi * configure.in: Test for posix threads first, then for dce threads. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bb9f41d..ecde6e9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +1999-03-14 Raja R Harinath + + * configure.in (glibconfig.h): Remove widechar tests and defines. + (fd_set): Change the grep for `fd_mask' to search for `fd_set'. + * gerror.c (fd_mask): Remove conditional typedef. It is not used + elsewhere in the file. + * gmain.c (fd_mask): Likewise. + 1999-03-12 Sebastian Wilhelmi * configure.in: Test for posix threads first, then for dce threads. diff --git a/configure.in b/configure.in index f95ebb8..b4fd293 100644 --- a/configure.in +++ b/configure.in @@ -310,7 +310,7 @@ AC_TRY_COMPILE([#include ], if test $gtk_ok = yes; then AC_MSG_RESULT([yes, found in sys/types.h]) else - AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes) + AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes) if test $gtk_ok = yes; then AC_DEFINE(HAVE_SYS_SELECT_H) AC_MSG_RESULT([yes, found in sys/select.h]) @@ -320,56 +320,6 @@ else fi fi -# These are used only in GDK (gdki18n.h) -# This stuff is here only so that we can define these -# things in glibconfig.h. If gtk+ started using an installed -# gdkconfig.h file, then the definitions would belong there. - -# Check for wchar.h - -AC_MSG_CHECKING(for wchar.h) -AC_TRY_CPP([#include ], glib_wchar_h=yes, glib_wchar_h=no) -if test $glib_wchar_h = yes; then - AC_DEFINE(HAVE_WCHAR_H) -fi -AC_MSG_RESULT($glib_wchar_h) - -# Check for wctype.h (for iswalnum) - -AC_MSG_CHECKING(for wctype.h) -AC_TRY_CPP([#include ], glib_wctype_h=yes, glib_wctype_h=no) -if test $glib_wctype_h = yes; then - AC_DEFINE(HAVE_WCTYPE_H) -fi -AC_MSG_RESULT($glib_wctype_h) - -oLIBS="$LIBS" -# in Solaris 2.5, `iswalnum' is in -lw -AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum)]) - -# The following is necessary for Linux libc-5.4.38 -AC_MSG_CHECKING(if iswalnum() and friends are properly defined) -AC_TRY_LINK([#include ],[ -#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) -# ifdef HAVE_WCTYPE_H -# include -# else -# ifdef HAVE_WCHAR_H -# include -# endif -# endif -#else -# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c)) -#endif -iswalnum((wchar_t) 0); -], glib_working_wctype=yes, glib_working_wctype=no) -LIBS="$oLIBS" - -if test $glib_working_wctype = no; then - AC_DEFINE(HAVE_BROKEN_WCTYPE) -fi -AC_MSG_RESULT($glib_working_wctype) - dnl ********************** dnl *** va_copy checks *** @@ -1038,12 +988,7 @@ _______EOF cat glibconfig-sysdefs.h >>$outfile fi - cat >>$outfile <<_______EOF - -$glib_wc - - #ifdef __cplusplus } #endif /* __cplusplus */ @@ -1217,19 +1162,6 @@ x$ac_cv_c_bigendian) ;; esac -if test x$glib_wchar_h = xyes; then - glib_wc=' -#define G_HAVE_WCHAR_H 1' -fi -if test x$glib_wctype_h = xyes; then - glib_wc="\$glib_wc -#define G_HAVE_WCTYPE_H 1" -fi -if test x$glib_working_wctype = xno; then - glib_wc="\$glib_wc -#define G_HAVE_BROKEN_WCTYPE 1" -fi - case x$enable_threads in xyes) g_enable_threads_def="#define";; *) g_enable_threads_def="#undef ";; diff --git a/gbacktrace.c b/gbacktrace.c index af55223..cd9350d 100644 --- a/gbacktrace.c +++ b/gbacktrace.c @@ -66,9 +66,6 @@ #ifndef NO_FD_SET # define SELECT_MASK fd_set #else -# ifndef _AIX - typedef long fd_mask; -# endif # if defined(_IBMR2) # define SELECT_MASK void # else diff --git a/gerror.c b/gerror.c index af55223..cd9350d 100644 --- a/gerror.c +++ b/gerror.c @@ -66,9 +66,6 @@ #ifndef NO_FD_SET # define SELECT_MASK fd_set #else -# ifndef _AIX - typedef long fd_mask; -# endif # if defined(_IBMR2) # define SELECT_MASK void # else diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c index af55223..cd9350d 100644 --- a/glib/gbacktrace.c +++ b/glib/gbacktrace.c @@ -66,9 +66,6 @@ #ifndef NO_FD_SET # define SELECT_MASK fd_set #else -# ifndef _AIX - typedef long fd_mask; -# endif # if defined(_IBMR2) # define SELECT_MASK void # else diff --git a/glib/gerror.c b/glib/gerror.c index af55223..cd9350d 100644 --- a/glib/gerror.c +++ b/glib/gerror.c @@ -66,9 +66,6 @@ #ifndef NO_FD_SET # define SELECT_MASK fd_set #else -# ifndef _AIX - typedef long fd_mask; -# endif # if defined(_IBMR2) # define SELECT_MASK void # else diff --git a/glib/gmain.c b/glib/gmain.c index 6dceb88..4976ceb 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -321,14 +321,11 @@ g_poll (GPollFD *fds, guint nfds, gint timeout) #ifdef HAVE_SYS_SELECT_H #include -#endif /* HAVE_SYS_SELECT_H_ */ +#endif /* HAVE_SYS_SELECT_H */ #ifndef NO_FD_SET # define SELECT_MASK fd_set #else /* !NO_FD_SET */ -# ifndef _AIX -typedef long fd_mask; -# endif /* _AIX */ # ifdef _IBMR2 # define SELECT_MASK void # else /* !_IBMR2 */ diff --git a/gmain.c b/gmain.c index 6dceb88..4976ceb 100644 --- a/gmain.c +++ b/gmain.c @@ -321,14 +321,11 @@ g_poll (GPollFD *fds, guint nfds, gint timeout) #ifdef HAVE_SYS_SELECT_H #include -#endif /* HAVE_SYS_SELECT_H_ */ +#endif /* HAVE_SYS_SELECT_H */ #ifndef NO_FD_SET # define SELECT_MASK fd_set #else /* !NO_FD_SET */ -# ifndef _AIX -typedef long fd_mask; -# endif /* _AIX */ # ifdef _IBMR2 # define SELECT_MASK void # else /* !_IBMR2 */