mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-09-20 01:06:15 +02:00
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.
This commit is contained in:
parent
cc7f889607
commit
bfc21756e1
@ -1,3 +1,11 @@
|
|||||||
|
1999-03-14 Raja R Harinath <harinath@cs.umn.edu>
|
||||||
|
|
||||||
|
* 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 <wilhelmi@ira.uka.de>
|
1999-03-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
* configure.in: Test for posix threads first, then for dce threads.
|
* configure.in: Test for posix threads first, then for dce threads.
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
1999-03-14 Raja R Harinath <harinath@cs.umn.edu>
|
||||||
|
|
||||||
|
* 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 <wilhelmi@ira.uka.de>
|
1999-03-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
* configure.in: Test for posix threads first, then for dce threads.
|
* configure.in: Test for posix threads first, then for dce threads.
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
1999-03-14 Raja R Harinath <harinath@cs.umn.edu>
|
||||||
|
|
||||||
|
* 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 <wilhelmi@ira.uka.de>
|
1999-03-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
* configure.in: Test for posix threads first, then for dce threads.
|
* configure.in: Test for posix threads first, then for dce threads.
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
1999-03-14 Raja R Harinath <harinath@cs.umn.edu>
|
||||||
|
|
||||||
|
* 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 <wilhelmi@ira.uka.de>
|
1999-03-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
* configure.in: Test for posix threads first, then for dce threads.
|
* configure.in: Test for posix threads first, then for dce threads.
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
1999-03-14 Raja R Harinath <harinath@cs.umn.edu>
|
||||||
|
|
||||||
|
* 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 <wilhelmi@ira.uka.de>
|
1999-03-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
* configure.in: Test for posix threads first, then for dce threads.
|
* configure.in: Test for posix threads first, then for dce threads.
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
1999-03-14 Raja R Harinath <harinath@cs.umn.edu>
|
||||||
|
|
||||||
|
* 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 <wilhelmi@ira.uka.de>
|
1999-03-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
* configure.in: Test for posix threads first, then for dce threads.
|
* configure.in: Test for posix threads first, then for dce threads.
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
1999-03-14 Raja R Harinath <harinath@cs.umn.edu>
|
||||||
|
|
||||||
|
* 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 <wilhelmi@ira.uka.de>
|
1999-03-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
* configure.in: Test for posix threads first, then for dce threads.
|
* configure.in: Test for posix threads first, then for dce threads.
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
1999-03-14 Raja R Harinath <harinath@cs.umn.edu>
|
||||||
|
|
||||||
|
* 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 <wilhelmi@ira.uka.de>
|
1999-03-12 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
* configure.in: Test for posix threads first, then for dce threads.
|
* configure.in: Test for posix threads first, then for dce threads.
|
||||||
|
70
configure.in
70
configure.in
@ -310,7 +310,7 @@ AC_TRY_COMPILE([#include <sys/types.h>],
|
|||||||
if test $gtk_ok = yes; then
|
if test $gtk_ok = yes; then
|
||||||
AC_MSG_RESULT([yes, found in sys/types.h])
|
AC_MSG_RESULT([yes, found in sys/types.h])
|
||||||
else
|
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
|
if test $gtk_ok = yes; then
|
||||||
AC_DEFINE(HAVE_SYS_SELECT_H)
|
AC_DEFINE(HAVE_SYS_SELECT_H)
|
||||||
AC_MSG_RESULT([yes, found in sys/select.h])
|
AC_MSG_RESULT([yes, found in sys/select.h])
|
||||||
@ -320,56 +320,6 @@ else
|
|||||||
fi
|
fi
|
||||||
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 <wchar.h>], 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 <wctype.h>], 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 <stdlib.h>],[
|
|
||||||
#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
|
|
||||||
# ifdef HAVE_WCTYPE_H
|
|
||||||
# include <wctype.h>
|
|
||||||
# else
|
|
||||||
# ifdef HAVE_WCHAR_H
|
|
||||||
# include <wchar.h>
|
|
||||||
# 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 **********************
|
||||||
dnl *** va_copy checks ***
|
dnl *** va_copy checks ***
|
||||||
@ -1038,12 +988,7 @@ _______EOF
|
|||||||
cat glibconfig-sysdefs.h >>$outfile
|
cat glibconfig-sysdefs.h >>$outfile
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
cat >>$outfile <<_______EOF
|
cat >>$outfile <<_______EOF
|
||||||
|
|
||||||
$glib_wc
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
@ -1217,19 +1162,6 @@ x$ac_cv_c_bigendian)
|
|||||||
;;
|
;;
|
||||||
esac
|
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
|
case x$enable_threads in
|
||||||
xyes) g_enable_threads_def="#define";;
|
xyes) g_enable_threads_def="#define";;
|
||||||
*) g_enable_threads_def="#undef ";;
|
*) g_enable_threads_def="#undef ";;
|
||||||
|
@ -66,9 +66,6 @@
|
|||||||
#ifndef NO_FD_SET
|
#ifndef NO_FD_SET
|
||||||
# define SELECT_MASK fd_set
|
# define SELECT_MASK fd_set
|
||||||
#else
|
#else
|
||||||
# ifndef _AIX
|
|
||||||
typedef long fd_mask;
|
|
||||||
# endif
|
|
||||||
# if defined(_IBMR2)
|
# if defined(_IBMR2)
|
||||||
# define SELECT_MASK void
|
# define SELECT_MASK void
|
||||||
# else
|
# else
|
||||||
|
3
gerror.c
3
gerror.c
@ -66,9 +66,6 @@
|
|||||||
#ifndef NO_FD_SET
|
#ifndef NO_FD_SET
|
||||||
# define SELECT_MASK fd_set
|
# define SELECT_MASK fd_set
|
||||||
#else
|
#else
|
||||||
# ifndef _AIX
|
|
||||||
typedef long fd_mask;
|
|
||||||
# endif
|
|
||||||
# if defined(_IBMR2)
|
# if defined(_IBMR2)
|
||||||
# define SELECT_MASK void
|
# define SELECT_MASK void
|
||||||
# else
|
# else
|
||||||
|
@ -66,9 +66,6 @@
|
|||||||
#ifndef NO_FD_SET
|
#ifndef NO_FD_SET
|
||||||
# define SELECT_MASK fd_set
|
# define SELECT_MASK fd_set
|
||||||
#else
|
#else
|
||||||
# ifndef _AIX
|
|
||||||
typedef long fd_mask;
|
|
||||||
# endif
|
|
||||||
# if defined(_IBMR2)
|
# if defined(_IBMR2)
|
||||||
# define SELECT_MASK void
|
# define SELECT_MASK void
|
||||||
# else
|
# else
|
||||||
|
@ -66,9 +66,6 @@
|
|||||||
#ifndef NO_FD_SET
|
#ifndef NO_FD_SET
|
||||||
# define SELECT_MASK fd_set
|
# define SELECT_MASK fd_set
|
||||||
#else
|
#else
|
||||||
# ifndef _AIX
|
|
||||||
typedef long fd_mask;
|
|
||||||
# endif
|
|
||||||
# if defined(_IBMR2)
|
# if defined(_IBMR2)
|
||||||
# define SELECT_MASK void
|
# define SELECT_MASK void
|
||||||
# else
|
# else
|
||||||
|
@ -321,14 +321,11 @@ g_poll (GPollFD *fds, guint nfds, gint timeout)
|
|||||||
|
|
||||||
#ifdef HAVE_SYS_SELECT_H
|
#ifdef HAVE_SYS_SELECT_H
|
||||||
#include <sys/select.h>
|
#include <sys/select.h>
|
||||||
#endif /* HAVE_SYS_SELECT_H_ */
|
#endif /* HAVE_SYS_SELECT_H */
|
||||||
|
|
||||||
#ifndef NO_FD_SET
|
#ifndef NO_FD_SET
|
||||||
# define SELECT_MASK fd_set
|
# define SELECT_MASK fd_set
|
||||||
#else /* !NO_FD_SET */
|
#else /* !NO_FD_SET */
|
||||||
# ifndef _AIX
|
|
||||||
typedef long fd_mask;
|
|
||||||
# endif /* _AIX */
|
|
||||||
# ifdef _IBMR2
|
# ifdef _IBMR2
|
||||||
# define SELECT_MASK void
|
# define SELECT_MASK void
|
||||||
# else /* !_IBMR2 */
|
# else /* !_IBMR2 */
|
||||||
|
5
gmain.c
5
gmain.c
@ -321,14 +321,11 @@ g_poll (GPollFD *fds, guint nfds, gint timeout)
|
|||||||
|
|
||||||
#ifdef HAVE_SYS_SELECT_H
|
#ifdef HAVE_SYS_SELECT_H
|
||||||
#include <sys/select.h>
|
#include <sys/select.h>
|
||||||
#endif /* HAVE_SYS_SELECT_H_ */
|
#endif /* HAVE_SYS_SELECT_H */
|
||||||
|
|
||||||
#ifndef NO_FD_SET
|
#ifndef NO_FD_SET
|
||||||
# define SELECT_MASK fd_set
|
# define SELECT_MASK fd_set
|
||||||
#else /* !NO_FD_SET */
|
#else /* !NO_FD_SET */
|
||||||
# ifndef _AIX
|
|
||||||
typedef long fd_mask;
|
|
||||||
# endif /* _AIX */
|
|
||||||
# ifdef _IBMR2
|
# ifdef _IBMR2
|
||||||
# define SELECT_MASK void
|
# define SELECT_MASK void
|
||||||
# else /* !_IBMR2 */
|
# else /* !_IBMR2 */
|
||||||
|
Loading…
Reference in New Issue
Block a user