Commit abe659db authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Merge changes from LDAP_3_3+prerelease into BOOLEAN_LDAP

parent b031d1c1
......@@ -15,5 +15,3 @@ CC = cc
PLATFORMCFLAGS= -Dfreebsd
# uncomment this line if using for LDAP_CRYPT
#PLATFORMLIBS= -lcrypt
......@@ -16,5 +16,3 @@ RANLIB = "ranlib"
PLATFORMCFLAGS= -Dlinux
# uncomment this if -DLDAP_CRYPT is defined
#PLATFORMLIBS= -lcrypt
......@@ -2071,6 +2071,7 @@ EOF
fi
for ac_hdr in \
stddef.h \
fcntl.h \
limits.h \
malloc.h \
......@@ -2085,17 +2086,17 @@ for ac_hdr in \
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2089: checking for $ac_hdr" >&5
echo "configure:2090: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2094 "configure"
#line 2095 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
......@@ -2123,12 +2124,12 @@ done
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
echo "configure:2127: checking for uid_t in sys/types.h" >&5
echo "configure:2128: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2132 "configure"
#line 2133 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
......@@ -2157,7 +2158,7 @@ EOF
fi
echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
echo "configure:2161: checking type of array argument to getgroups" >&5
echo "configure:2162: checking type of array argument to getgroups" >&5
if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -2165,7 +2166,7 @@ else
ac_cv_type_getgroups=cross
else
cat > conftest.$ac_ext <<EOF
#line 2169 "configure"
#line 2170 "configure"
#include "confdefs.h"
/* Thanks to Mike Rendell for this test. */
......@@ -2190,7 +2191,7 @@ main()
}
EOF
if { (eval echo configure:2194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
if { (eval echo configure:2195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_type_getgroups=gid_t
else
......@@ -2204,7 +2205,7 @@ fi
if test $ac_cv_type_getgroups = cross; then
cat > conftest.$ac_ext <<EOF
#line 2208 "configure"
#line 2209 "configure"
#include "confdefs.h"
#include <unistd.h>
EOF
......@@ -2228,12 +2229,12 @@ EOF
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
echo "configure:2232: checking for mode_t" >&5
echo "configure:2233: checking for mode_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2237 "configure"
#line 2238 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
......@@ -2261,12 +2262,12 @@ EOF
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
echo "configure:2265: checking for off_t" >&5
echo "configure:2266: checking for off_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2270 "configure"
#line 2271 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
......@@ -2294,12 +2295,12 @@ EOF
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
echo "configure:2298: checking for pid_t" >&5
echo "configure:2299: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2303 "configure"
#line 2304 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
......@@ -2327,12 +2328,12 @@ EOF
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
echo "configure:2331: checking return type of signal handlers" >&5
echo "configure:2332: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2336 "configure"
#line 2337 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
......@@ -2349,7 +2350,7 @@ int main() {
int i;
; return 0; }
EOF
if { (eval echo configure:2353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
......@@ -2368,12 +2369,12 @@ EOF
echo $ac_n "checking for size_t""... $ac_c" 1>&6
echo "configure:2372: checking for size_t" >&5
echo "configure:2373: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2377 "configure"
#line 2378 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
......@@ -2401,12 +2402,12 @@ EOF
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
echo "configure:2405: checking for uid_t in sys/types.h" >&5
echo "configure:2406: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2410 "configure"
#line 2411 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
......@@ -2435,12 +2436,12 @@ EOF
fi
echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
echo "configure:2439: checking for st_blksize in struct stat" >&5
echo "configure:2440: checking for st_blksize in struct stat" >&5
if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2444 "configure"
#line 2445 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
......@@ -2448,7 +2449,7 @@ int main() {
struct stat s; s.st_blksize;
; return 0; }
EOF
if { (eval echo configure:2452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_blksize=yes
else
......@@ -2469,12 +2470,12 @@ EOF
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
echo "configure:2473: checking whether time.h and sys/time.h may both be included" >&5
echo "configure:2474: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2478 "configure"
#line 2479 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
......@@ -2483,7 +2484,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
if { (eval echo configure:2487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
......@@ -2504,12 +2505,12 @@ EOF
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
echo "configure:2508: checking whether struct tm is in sys/time.h or time.h" >&5
echo "configure:2509: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2513 "configure"
#line 2514 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
......@@ -2517,7 +2518,7 @@ int main() {
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
if { (eval echo configure:2521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
......@@ -2539,12 +2540,12 @@ fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:2543: checking for working const" >&5
echo "configure:2544: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2548 "configure"
#line 2549 "configure"
#include "confdefs.h"
int main() {
......@@ -2593,7 +2594,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
if { (eval echo configure:2597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
......@@ -2615,7 +2616,7 @@ fi
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
echo "configure:2619: checking for 8-bit clean memcmp" >&5
echo "configure:2620: checking for 8-bit clean memcmp" >&5
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -2623,7 +2624,7 @@ else
ac_cv_func_memcmp_clean=no
else
cat > conftest.$ac_ext <<EOF
#line 2627 "configure"
#line 2628 "configure"
#include "confdefs.h"
main()
......@@ -2633,7 +2634,7 @@ main()
}
EOF
if { (eval echo configure:2637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
if { (eval echo configure:2638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_func_memcmp_clean=yes
else
......@@ -2651,12 +2652,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o"
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
echo "configure:2655: checking return type of signal handlers" >&5
echo "configure:2656: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2660 "configure"
#line 2661 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
......@@ -2673,7 +2674,7 @@ int main() {
int i;
; return 0; }
EOF
if { (eval echo configure:2677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
......@@ -2692,12 +2693,12 @@ EOF
echo $ac_n "checking for strftime""... $ac_c" 1>&6
echo "configure:2696: checking for strftime" >&5
echo "configure:2697: checking for strftime" >&5
if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2701 "configure"
#line 2702 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strftime(); below. */
......@@ -2720,7 +2721,7 @@ strftime();
; return 0; }
EOF
if { (eval echo configure:2724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:2725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_strftime=yes"
else
......@@ -2742,7 +2743,7 @@ else
echo "$ac_t""no" 1>&6
# strftime is in -lintl on SCO UNIX.
echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
echo "configure:2746: checking for strftime in -lintl" >&5
echo "configure:2747: checking for strftime in -lintl" >&5
ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -2750,7 +2751,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2754 "configure"
#line 2755 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
......@@ -2761,7 +2762,7 @@ int main() {
strftime()
; return 0; }
EOF
if { (eval echo configure:2765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:2766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
......@@ -2788,12 +2789,12 @@ fi
fi
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
echo "configure:2792: checking for vprintf" >&5
echo "configure:2793: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2797 "configure"
#line 2798 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
......@@ -2816,7 +2817,7 @@ vprintf();
; return 0; }
EOF
if { (eval echo configure:2820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:2821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
......@@ -2840,12 +2841,12 @@ fi
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
echo "configure:2844: checking for _doprnt" >&5
echo "configure:2845: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2849 "configure"
#line 2850 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
......@@ -2868,7 +2869,7 @@ _doprnt();
; return 0; }
EOF
if { (eval echo configure:2872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:2873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
......@@ -2893,7 +2894,7 @@ fi
fi
echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
echo "configure:2897: checking for wait3 that fills in rusage" >&5
echo "configure:2898: checking for wait3 that fills in rusage" >&5
if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -2901,7 +2902,7 @@ else
ac_cv_func_wait3_rusage=no
else
cat > conftest.$ac_ext <<EOF
#line 2905 "configure"
#line 2906 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
......@@ -2932,7 +2933,7 @@ main() {
}
}
EOF
if { (eval echo configure:2936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
if { (eval echo configure:2937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_func_wait3_rusage=yes
else
......@@ -2972,12 +2973,12 @@ for ac_func in \
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:2976: checking for $ac_func" >&5
echo "configure:2977: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2981 "configure"
#line 2982 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
......@@ -3000,7 +3001,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:3004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:3005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
......@@ -3028,12 +3029,12 @@ done
for ac_func in strdup
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3032: checking for $ac_func" >&5
echo "configure:3033: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3037 "configure"
#line 3038 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
......@@ -3056,7 +3057,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:3061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
......@@ -3086,13 +3087,13 @@ done
# Check Configuration
echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6
echo "configure:3090: checking declaration of sys_errlist" >&5
echo "configure:3091: checking declaration of sys_errlist" >&5
if eval "test \"`echo '$''{'cf_cv_dcl_sys_errlist'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3096 "configure"
#line 3097 "configure"
#include "confdefs.h"
#include <stdio.h>
......@@ -3102,7 +3103,7 @@ int main() {
char *c = (char *) *sys_errlist
; return 0; }
EOF
if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:3107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_dcl_sys_errlist=yes
else
......@@ -3123,20 +3124,20 @@ if test $cf_cv_dcl_sys_errlist = no ; then
EOF
echo $ac_n "checking existence of sys_errlist""... $ac_c" 1>&6
echo "configure:3127: checking existence of sys_errlist" >&5
echo "configure:3128: checking existence of sys_errlist" >&5
if eval "test \"`echo '$''{'cf_cv_have_sys_errlist'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3133 "configure"
#line 3134 "configure"
#include "confdefs.h"
#include <errno.h>
int main() {
char *c = (char *) *sys_errlist
; return 0; }
EOF
if { (eval echo configure:3140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:3141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
cf_cv_have_sys_errlist=yes
else
......
......@@ -225,6 +225,7 @@ AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS( \
stddef.h \
fcntl.h \
limits.h \
malloc.h \
......
......@@ -99,9 +99,11 @@ typedef void *(*VFP)();
/* sunos5 threads are preemptive */
#define PTHREAD_PREEMPTIVE 1
#if !defined(__SunOS_5_6)
/* thread attributes and thread type */
typedef int pthread_attr_t;
typedef thread_t pthread_t;
#endif /* ! sunos56 */
/* default attr states */
#define pthread_mutexattr_default NULL
......@@ -114,17 +116,21 @@ typedef thread_t pthread_t;
#define PTHREAD_SCOPE_PROCESS 0
#define PTHREAD_SCOPE_SYSTEM THR_BOUND
#if !defined(__SunOS_5_6)
/* mutex attributes and mutex type */
typedef int pthread_mutexattr_t;
typedef mutex_t pthread_mutex_t;
#endif /* ! sunos56 */
/* mutex and condition variable scope - process or system */
#define PTHREAD_SHARE_PRIVATE USYNC_THREAD
#define PTHREAD_SHARE_PROCESS USYNC_PROCESS
#if !defined(__SunOS_5_6)
/* condition variable attributes and condition variable type */
typedef int pthread_condattr_t;
typedef cond_t pthread_cond_t;
#endif /* ! sunos56 */
#else /* end sunos5 */
......
#ifdef HAVE_STDDEF_H
# include <stddef.h>
#endif
#endif /* _LDAP_PORTABLE_H */
......@@ -166,6 +166,9 @@
/* Define if you have the <sgtty.h> header file. */
#undef HAVE_SGTTY_H
/* Define if you have the <stddef.h> header file. */
#undef HAVE_STDDEF_H
/* Define if you have the <sys/dir.h> header file. */
#undef HAVE_SYS_DIR_H
......@@ -193,4 +196,8 @@
/* Define if you have the compat library (-lcompat). */
#undef HAVE_LIBCOMPAT
#ifdef HAVE_STDDEF_H
# include <stddef.h>
#endif
#endif /* _LDAP_PORTABLE_H */
......@@ -24,7 +24,7 @@
#include <malloc.h>
#endif
#endif /* next || vms */
#if defined( BC31 ) || defined( _WIN32 ) || defined( sunos5 )
#if defined( BC31 ) || defined( _WIN32 )
#include <stdarg.h>
#else /* BC31 || _WIN32 */
#include <varargs.h>
......@@ -522,7 +522,7 @@ ber_put_set( BerElement *ber )
/* VARARGS */
int
ber_printf(
#if defined( MACOS ) || defined( _WIN32 ) || defined( BC31 ) || defined( sunos5 )
#if defined( MACOS ) || defined( _WIN32 ) || defined( BC31 )
BerElement *ber, char *fmt, ... )
#else /* MACOS || _WIN32 || BC31 */
va_alist )
......@@ -530,22 +530,22 @@ va_dcl
#endif /* MACOS || _WIN32 || BC31 */
{
va_list ap;
#if !defined( MACOS ) && !defined( _WIN32 ) && !defined( BC31 ) && !defined( sunos5 )
#if !defined( MACOS ) && !defined( _WIN32 ) && !defined( BC31 )
BerElement *ber;
char *fmt;
#endif /* !MACOS && !_WIN32 && !BC31 && !sunos5 */