Fix build on Mac OS X (and maybe FreeBSD, too)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@269119 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
tilghman
parent
37bc8c80db
commit
6db8e08fa3
15
configure.ac
15
configure.ac
|
|
@ -550,6 +550,21 @@ then
|
|||
AC_CHECK_FILE(/dev/urandom, AC_DEFINE([HAVE_DEV_URANDOM], 1, [Define to 1 if your system has /dev/urandom.]))
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(for locale_t in locale.h)
|
||||
AC_LINK_IFELSE(
|
||||
AC_LANG_PROGRAM([#include <locale.h>], [locale_t lt = NULL]),
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE([HAVE_LOCALE_T_IN_LOCALE_H], 1, [Define to 1 if your system defines the locale_t type in locale.h]),
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_CHECKING(for locale_t in xlocale.h)
|
||||
AC_LINK_IFELSE(
|
||||
AC_LANG_PROGRAM([#include <xlocale.h>], [locale_t lt = NULL]),
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE([HAVE_LOCALE_T_IN_XLOCALE_H], 1, [Define to 1 if your system defines the locale_t type in xlocale.h]),
|
||||
AC_MSG_RESULT(no)
|
||||
)
|
||||
)
|
||||
|
||||
AC_MSG_CHECKING(for O_EVTONLY in fcntl.h)
|
||||
AC_LINK_IFELSE(
|
||||
AC_LANG_PROGRAM([#include <fcntl.h>], [int a = O_EVTONLY;]),
|
||||
|
|
|
|||
|
|
@ -372,6 +372,12 @@
|
|||
/* Define to 1 if you have the <locale.h> header file. */
|
||||
#undef HAVE_LOCALE_H
|
||||
|
||||
/* Define to 1 if your system defines the locale_t type in locale.h */
|
||||
#undef HAVE_LOCALE_T_IN_LOCALE_H
|
||||
|
||||
/* Define to 1 if your system defines the locale_t type in xlocale.h */
|
||||
#undef HAVE_LOCALE_T_IN_XLOCALE_H
|
||||
|
||||
/* Define to 1 if you have the `localtime_r' function. */
|
||||
#undef HAVE_LOCALTIME_R
|
||||
|
||||
|
|
@ -794,7 +800,7 @@
|
|||
/* Define to 1 if you have the `strtoq' function. */
|
||||
#undef HAVE_STRTOQ
|
||||
|
||||
/* Define to 1 if `st_blksize' is a member of `struct stat'. */
|
||||
/* Define to 1 if `st_blksize' is member of `struct stat'. */
|
||||
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
|
||||
|
||||
/* Define to 1 if you have the mISDN Supplemental Services library. */
|
||||
|
|
@ -1062,12 +1068,12 @@
|
|||
/* Define to the one symbol short name of this package. */
|
||||
#undef PACKAGE_TARNAME
|
||||
|
||||
/* Define to the home page for this package. */
|
||||
#undef PACKAGE_URL
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#undef PACKAGE_VERSION
|
||||
|
||||
/* Define to 1 if the C compiler supports function prototypes. */
|
||||
#undef PROTOTYPES
|
||||
|
||||
/* Define to necessary symbol if this constant uses a non-standard name on
|
||||
your system. */
|
||||
#undef PTHREAD_CREATE_JOINABLE
|
||||
|
|
@ -1087,6 +1093,11 @@
|
|||
/* Define to the type of arg 5 for `select'. */
|
||||
#undef SELECT_TYPE_ARG5
|
||||
|
||||
/* Define to 1 if the `setvbuf' function takes the buffering type as its
|
||||
second argument and the buffer pointer as the third, as on System V before
|
||||
release 3. */
|
||||
#undef SETVBUF_REVERSED
|
||||
|
||||
/* The size of `char *', as computed by sizeof. */
|
||||
#undef SIZEOF_CHAR_P
|
||||
|
||||
|
|
@ -1116,30 +1127,20 @@
|
|||
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
|
||||
#undef TM_IN_SYS_TIME
|
||||
|
||||
/* Enable extensions on AIX 3, Interix. */
|
||||
/* Define to 1 if on AIX 3.
|
||||
System headers sometimes define this.
|
||||
We just want to avoid a redefinition error message. */
|
||||
#ifndef _ALL_SOURCE
|
||||
# undef _ALL_SOURCE
|
||||
#endif
|
||||
|
||||
/* Number of bits in a file offset, on hosts where this is settable. */
|
||||
#undef _FILE_OFFSET_BITS
|
||||
|
||||
/* Enable GNU extensions on systems that have them. */
|
||||
#ifndef _GNU_SOURCE
|
||||
# undef _GNU_SOURCE
|
||||
#endif
|
||||
/* Enable threading extensions on Solaris. */
|
||||
#ifndef _POSIX_PTHREAD_SEMANTICS
|
||||
# undef _POSIX_PTHREAD_SEMANTICS
|
||||
#endif
|
||||
/* Enable extensions on HP NonStop. */
|
||||
#ifndef _TANDEM_SOURCE
|
||||
# undef _TANDEM_SOURCE
|
||||
#endif
|
||||
/* Enable general extensions on Solaris. */
|
||||
#ifndef __EXTENSIONS__
|
||||
# undef __EXTENSIONS__
|
||||
#endif
|
||||
|
||||
|
||||
/* Number of bits in a file offset, on hosts where this is settable. */
|
||||
#undef _FILE_OFFSET_BITS
|
||||
|
||||
/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
|
||||
#undef _LARGEFILE_SOURCE
|
||||
|
|
@ -1157,6 +1158,20 @@
|
|||
/* Define to 1 if you need to in order for `stat' and other things to work. */
|
||||
#undef _POSIX_SOURCE
|
||||
|
||||
/* Enable extensions on Solaris. */
|
||||
#ifndef __EXTENSIONS__
|
||||
# undef __EXTENSIONS__
|
||||
#endif
|
||||
#ifndef _POSIX_PTHREAD_SEMANTICS
|
||||
# undef _POSIX_PTHREAD_SEMANTICS
|
||||
#endif
|
||||
#ifndef _TANDEM_SOURCE
|
||||
# undef _TANDEM_SOURCE
|
||||
#endif
|
||||
|
||||
/* Define like PROTOTYPES; this can be used by system headers. */
|
||||
#undef __PROTOTYPES
|
||||
|
||||
/* Define to empty if `const' does not conform to ANSI C. */
|
||||
#undef const
|
||||
|
||||
|
|
|
|||
|
|
@ -24,8 +24,10 @@
|
|||
#ifndef _ASTERISK_LOCALTIME_H
|
||||
#define _ASTERISK_LOCALTIME_H
|
||||
|
||||
#ifdef HAVE_NEWLOCALE
|
||||
#ifdef HAVE_LOCALE_T_IN_LOCALE_H
|
||||
#include <locale.h>
|
||||
#elif defined(HAVE_LOCALE_T_IN_XLOCALE_H)
|
||||
#include <xlocale.h>
|
||||
#else
|
||||
typedef void * locale_t;
|
||||
#endif
|
||||
|
|
|
|||
Reference in New Issue