User: vins
Date: 05/11/25 03:02:05
Branch: xemacs release-21-4
xemacs/etc release-21-4
xemacs/lisp release-21-4
xemacs/src release-21-4
Modified: xemacs/src ChangeLog callproc.c chartab.c config.h.in
database.c glyphs-gtk.c process-unix.c sysdll.c
Log:
More patches for 21.4.18.
Revision Changes Path
1.241.2.77 +13 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.241.2.76
retrieving revision 1.241.2.77
diff -u -p -r1.241.2.76 -r1.241.2.77
--- ChangeLog 2005/03/24 04:55:34 1.241.2.76
+++ ChangeLog 2005/11/25 01:59:59 1.241.2.77
@@ -1,3 +1,16 @@
+2005-11-15 Dr. Volker Zell <Dr.Volker.Zell(a)oracle.com>
+
+ * configure.in: Avoid using Motif also for cygwin
+
+2005-11-15 Dr. Volker Zell <Dr.Volker.Zell(a)oracle.com>
+
+ * configure.in: Check for u_int*_t typedefs and use them in
+ Berkeley DB detection.
+
+2005-04-11 Norbert Koch <viteno(a)xemacs.org>
+
+ * etc/PACKAGES: etc/PACKAGES: Announce re-builder, xetla.
+
2005-03-23 Vin Shelton <acs(a)xemacs.org>
* configure.in: Remove -fno-gnu-linker option from Solaris
1.147.2.34 +238 -53 XEmacs/xemacs/configure
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.147.2.33
retrieving revision 1.147.2.34
diff -u -p -r1.147.2.33 -r1.147.2.34
--- configure 2005/03/24 04:55:35 1.147.2.33
+++ configure 2005/11/25 02:00:00 1.147.2.34
@@ -9657,7 +9657,7 @@ rm -f conftest*
fi
case "$opsys" in
- *linux* ) lucid_prefers_motif="no" ;;
+ *linux* | cygwin* ) lucid_prefers_motif="no" ;;
* ) lucid_prefers_motif="yes" ;;
esac
@@ -14284,14 +14284,191 @@ EOF
}
+echo $ac_n "checking for u_int8_t""... $ac_c" 1>&6
+echo "configure:14289: checking for u_int8_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14292 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "(^|[^a-zA-Z_0-9])u_int8_t[^a-zA-Z_0-9]" >/dev/null 2>&1;
then
+ rm -rf conftest*
+ ac_cv_type_u_int8_t=yes
+else
+ rm -rf conftest*
+ ac_cv_type_u_int8_t=no
+fi
+rm -f conftest*
+
+echo "$ac_t""$ac_cv_type_u_int8_t" 1>&6
+if test $ac_cv_type_u_int8_t = no; then
+ { test "$extra_verbose" = "yes" && cat << \EOF
+ Defining u_int8_t = uint8_t
+EOF
+cat >> confdefs.h <<\EOF
+#define u_int8_t uint8_t
+EOF
+}
+
+fi
+
+if test $ac_cv_type_u_int8_t = yes; then
+{ test "$extra_verbose" = "yes" && cat << \EOF
+ Defining HAVE_U_INT8_T = 1
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_U_INT8_T 1
+EOF
+}
+
+fi
+echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6
+echo "configure:14333: checking for u_int16_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14336 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "(^|[^a-zA-Z_0-9])u_int16_t[^a-zA-Z_0-9]" >/dev/null 2>&1;
then
+ rm -rf conftest*
+ ac_cv_type_u_int16_t=yes
+else
+ rm -rf conftest*
+ ac_cv_type_u_int16_t=no
+fi
+rm -f conftest*
+
+echo "$ac_t""$ac_cv_type_u_int16_t" 1>&6
+if test $ac_cv_type_u_int16_t = no; then
+ { test "$extra_verbose" = "yes" && cat << \EOF
+ Defining u_int16_t = uint16_t
+EOF
+cat >> confdefs.h <<\EOF
+#define u_int16_t uint16_t
+EOF
+}
+
+fi
+
+if test $ac_cv_type_u_int16_t = yes; then
+{ test "$extra_verbose" = "yes" && cat << \EOF
+ Defining HAVE_U_INT16_T = 1
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_U_INT16_T 1
+EOF
+}
+
+fi
+echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6
+echo "configure:14377: checking for u_int32_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14380 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "(^|[^a-zA-Z_0-9])u_int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1;
then
+ rm -rf conftest*
+ ac_cv_type_u_int32_t=yes
+else
+ rm -rf conftest*
+ ac_cv_type_u_int32_t=no
+fi
+rm -f conftest*
+
+echo "$ac_t""$ac_cv_type_u_int32_t" 1>&6
+if test $ac_cv_type_u_int32_t = no; then
+ { test "$extra_verbose" = "yes" && cat << \EOF
+ Defining u_int32_t = uint32_t
+EOF
+cat >> confdefs.h <<\EOF
+#define u_int32_t uint32_t
+EOF
+}
+
+fi
+
+if test $ac_cv_type_u_int32_t = yes; then
+{ test "$extra_verbose" = "yes" && cat << \EOF
+ Defining HAVE_U_INT32_T = 1
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_U_INT32_T 1
+EOF
+}
+
+fi
+echo $ac_n "checking for u_int64_t""... $ac_c" 1>&6
+echo "configure:14421: checking for u_int64_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14424 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ egrep "(^|[^a-zA-Z_0-9])u_int64_t[^a-zA-Z_0-9]" >/dev/null 2>&1;
then
+ rm -rf conftest*
+ ac_cv_type_u_int64_t=yes
+else
+ rm -rf conftest*
+ ac_cv_type_u_int64_t=no
+fi
+rm -f conftest*
+
+echo "$ac_t""$ac_cv_type_u_int64_t" 1>&6
+if test $ac_cv_type_u_int64_t = no; then
+ { test "$extra_verbose" = "yes" && cat << \EOF
+ Defining u_int64_t = uint64_t
+EOF
+cat >> confdefs.h <<\EOF
+#define u_int64_t uint64_t
+EOF
+}
+
+fi
+
+if test $ac_cv_type_u_int64_t = yes; then
+{ test "$extra_verbose" = "yes" && cat << \EOF
+ Defining HAVE_U_INT64_T = 1
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_U_INT64_T 1
+EOF
+}
+
+fi
+
if test "$with_database_berkdb" != "no"; then
echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:14290: checking for Berkeley db.h" >&5
+echo "configure:14467: checking for Berkeley db.h" >&5
for header in "db/db.h" "db.h"; do
case "$opsys" in
*freebsd*)
cat > conftest.$ac_ext <<EOF
-#line 14295 "configure"
+#line 14472 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -14307,7 +14484,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:14311: \"$ac_compile\") 1>&5; (eval
$ac_compile) 2>&5; }; then
+if { (eval echo configure:14488: \"$ac_compile\") 1>&5; (eval
$ac_compile) 2>&5; }; then
rm -rf conftest*
db_h_file="$header"; break
else
@@ -14318,7 +14495,7 @@ rm -f conftest*
;;
*)
cat > conftest.$ac_ext <<EOF
-#line 14322 "configure"
+#line 14499 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -14326,21 +14503,29 @@ rm -f conftest*
#ifdef HAVE_INTTYPES_H
#define __BIT_TYPES_DEFINED__
#include <inttypes.h>
+#if !HAVE_U_INT8_T
typedef uint8_t u_int8_t;
+#endif
+#if !HAVE_U_INT16_T
typedef uint16_t u_int16_t;
+#endif
+#if !HAVE_U_INT32_T
typedef uint32_t u_int32_t;
+#endif
#ifdef WE_DONT_NEED_QUADS
+#if !HAVE_U_INT64_T
typedef uint64_t u_int64_t;
#endif
#endif
#endif
+#endif
#include <$header>
int main() {
; return 0; }
EOF
-if { (eval echo configure:14344: \"$ac_compile\") 1>&5; (eval
$ac_compile) 2>&5; }; then
+if { (eval echo configure:14529: \"$ac_compile\") 1>&5; (eval
$ac_compile) 2>&5; }; then
rm -rf conftest*
db_h_file="$header"; break
else
@@ -14358,9 +14543,9 @@ rm -f conftest*
if test "$with_database_berkdb" != "no"; then
echo $ac_n "checking for Berkeley DB version""... $ac_c"
1>&6
-echo "configure:14362: checking for Berkeley DB version" >&5
+echo "configure:14547: checking for Berkeley DB version" >&5
cat > conftest.$ac_ext <<EOF
-#line 14364 "configure"
+#line 14549 "configure"
#include "confdefs.h"
#include <$db_h_file>
#if DB_VERSION_MAJOR > 1
@@ -14372,7 +14557,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 14376 "configure"
+#line 14561 "configure"
#include "confdefs.h"
#include <$db_h_file>
#if DB_VERSION_MAJOR > 2
@@ -14399,10 +14584,10 @@ fi
rm -f conftest*
echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:14403: checking for $dbfunc" >&5
+echo "configure:14588: checking for $dbfunc" >&5
cat > conftest.$ac_ext <<EOF
-#line 14406 "configure"
+#line 14591 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $dbfunc(); below. */
@@ -14425,7 +14610,7 @@ $dbfunc();
; return 0; }
EOF
-if { (eval echo configure:14429: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14614: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$dbfunc=yes"
else
@@ -14444,12 +14629,12 @@ else
echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:14448: checking for $dbfunc in -ldb" >&5
+echo "configure:14633: checking for $dbfunc in -ldb" >&5
ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldb "
cat > conftest.$ac_ext <<EOF
-#line 14453 "configure"
+#line 14638 "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
@@ -14460,7 +14645,7 @@ int main() {
$dbfunc()
; return 0; }
EOF
-if { (eval echo configure:14464: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14649: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14524,12 +14709,12 @@ fi
if test "$with_socks" = "yes"; then
echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c"
1>&6
-echo "configure:14528: checking for SOCKSinit in -lsocks" >&5
+echo "configure:14713: checking for SOCKSinit in -lsocks" >&5
ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`
xe_check_libs=" -lsocks "
cat > conftest.$ac_ext <<EOF
-#line 14533 "configure"
+#line 14718 "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
@@ -14540,7 +14725,7 @@ int main() {
SOCKSinit()
; return 0; }
EOF
-if { (eval echo configure:14544: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14729: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14595,7 +14780,7 @@ fi
if test "$with_modules" != "no"; then
echo "checking for module support" 1>&6
-echo "configure:14599: checking for module support" >&5
+echo "configure:14784: checking for module support" >&5
if test "$with_msw" = "yes"; then
have_dl=yes;
@@ -14611,15 +14796,15 @@ EOF
;;
*) ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:14615: checking for dlfcn.h" >&5
+echo "configure:14800: checking for dlfcn.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14618 "configure"
+#line 14803 "configure"
#include "confdefs.h"
#include <dlfcn.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14623: \"$ac_try\") 1>&5; (eval $ac_try)
2>&5; }
+{ (eval echo configure:14808: \"$ac_try\") 1>&5; (eval $ac_try)
2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -14636,16 +14821,16 @@ if eval "test \"`echo '$ac_cv_header_'$a
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for dlopen in -lc""... $ac_c"
1>&6
-echo "configure:14640: checking for dlopen in -lc" >&5
+echo "configure:14825: checking for dlopen in -lc" >&5
cat > conftest.$ac_ext <<EOF
-#line 14642 "configure"
+#line 14827 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int main() {
dlopen ("", 0);
; return 0; }
EOF
-if { (eval echo configure:14649: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14834: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
@@ -14654,18 +14839,18 @@ else
rm -rf conftest*
echo $ac_n "checking for dlopen in -ldl""... $ac_c"
1>&6
-echo "configure:14658: checking for dlopen in -ldl" >&5
+echo "configure:14843: checking for dlopen in -ldl" >&5
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14662 "configure"
+#line 14847 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int main() {
dlopen ("", 0);
; return 0; }
EOF
-if { (eval echo configure:14669: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14854: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
@@ -14694,12 +14879,12 @@ EOF
else
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:14698: checking for shl_load in -ldld" >&5
+echo "configure:14883: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldld "
cat > conftest.$ac_ext <<EOF
-#line 14703 "configure"
+#line 14888 "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
@@ -14710,7 +14895,7 @@ int main() {
shl_load()
; return 0; }
EOF
-if { (eval echo configure:14714: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14899: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14737,12 +14922,12 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:14741: checking for dld_init in -ldld" >&5
+echo "configure:14926: checking for dld_init in -ldld" >&5
ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldld "
cat > conftest.$ac_ext <<EOF
-#line 14746 "configure"
+#line 14931 "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
@@ -14753,7 +14938,7 @@ int main() {
dld_init()
; return 0; }
EOF
-if { (eval echo configure:14757: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14942: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14800,7 +14985,7 @@ xehost=$canonical
xealias=$internal_configuration
echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:14804: checking how to build dynamic libraries for ${xehost}"
>&5
+echo "configure:14989: checking how to build dynamic libraries for ${xehost}"
>&5
# Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
case "$xehost" in
*-*-linux-gnu*) ;;
@@ -14828,9 +15013,9 @@ if test "$GCC" = "yes"; then
XEGCC=yes
else
echo $ac_n "checking checking whether we are using GNU C""...
$ac_c" 1>&6
-echo "configure:14832: checking checking whether we are using GNU C"
>&5
+echo "configure:15017: checking checking whether we are using GNU C"
>&5
cat > conftest.$ac_ext <<EOF
-#line 14834 "configure"
+#line 15019 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -14852,7 +15037,7 @@ rm -f conftest*
fi
echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:14856: checking how to produce PIC code" >&5
+echo "configure:15041: checking how to produce PIC code" >&5
wl=
can_build_shared=yes
@@ -14953,18 +15138,18 @@ if test -n "$dll_cflags"; then
# Check to make sure the dll_cflags actually works.
echo $ac_n "checking if PIC flag ${dll_cflags} really works""...
$ac_c" 1>&6
-echo "configure:14957: checking if PIC flag ${dll_cflags} really works"
>&5
+echo "configure:15142: checking if PIC flag ${dll_cflags} really works"
>&5
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $dll_cflags -DPIC"
cat > conftest.$ac_ext <<EOF
-#line 14961 "configure"
+#line 15146 "configure"
#include "confdefs.h"
int main() {
int x=0;
; return 0; }
EOF
-if { (eval echo configure:14968: \"$ac_compile\") 1>&5; (eval
$ac_compile) 2>&5; }; then
+if { (eval echo configure:15153: \"$ac_compile\") 1>&5; (eval
$ac_compile) 2>&5; }; then
rm -rf conftest*
# On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
@@ -14995,7 +15180,7 @@ cc_produces_so=no
xldf=
xcldf=
echo $ac_n "checking if C compiler can produce shared libraries""...
$ac_c" 1>&6
-echo "configure:14999: checking if C compiler can produce shared libraries"
>&5
+echo "configure:15184: checking if C compiler can produce shared libraries"
>&5
if test "$XEGCC" = yes -o "$__ICC" = yes; then
xcldf="-shared"
xldf="-shared"
@@ -15046,14 +15231,14 @@ if test -n "$xcldf"; then
xe_libs=
ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags
$xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
cat > conftest.$ac_ext <<EOF
-#line 15050 "configure"
+#line 15235 "configure"
#include "confdefs.h"
int main() {
int x=0;
; return 0; }
EOF
-if { (eval echo configure:15057: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15242: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cc_produces_so=yes
else
@@ -15078,7 +15263,7 @@ if test -z "$LTLD"; then
if test "$XEGCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:15082: checking for ld used by GCC" >&5
+echo "configure:15267: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
@@ -15104,7 +15289,7 @@ echo "configure:15082: checking for ld u
esac
else
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:15108: checking for GNU ld" >&5
+echo "configure:15293: checking for GNU ld" >&5
fi
if test -z "$LTLD"; then
@@ -15142,7 +15327,7 @@ ld_dynamic_link_flags=
# Check to see if it really is or isn't GNU ld.
echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6
-echo "configure:15146: checking if the linker is GNU ld" >&5
+echo "configure:15331: checking if the linker is GNU ld" >&5
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
xe_gnu_ld=yes
@@ -15170,7 +15355,7 @@ else
# OK - only NOW do we futz about with ld.
# See if the linker supports building shared libraries.
echo $ac_n "checking whether the linker supports shared libraries""...
$ac_c" 1>&6
-echo "configure:15174: checking whether the linker supports shared libraries"
>&5
+echo "configure:15359: checking whether the linker supports shared libraries"
>&5
dll_ld=$CC
dll_ldflags=$LDFLAGS
ld_shlibs=yes
@@ -15381,10 +15566,10 @@ EOF
for ac_func in dlerror _dlerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15385: checking for $ac_func" >&5
+echo "configure:15570: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 15388 "configure"
+#line 15573 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -15407,7 +15592,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:15411: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15596: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -15446,11 +15631,11 @@ done
fi
cat > conftest.$ac_ext <<EOF
-#line 15450 "configure"
+#line 15635 "configure"
#include "confdefs.h"
int main(int c,char *v[]){return 0;}
EOF
-if { (eval echo configure:15454: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:15639: \"$ac_link\") 1>&5; (eval $ac_link)
2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
1.151.2.33 +27 -1 XEmacs/xemacs/configure.in
Index: configure.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v
retrieving revision 1.151.2.32
retrieving revision 1.151.2.33
diff -u -p -r1.151.2.32 -r1.151.2.33
--- configure.in 2005/03/24 04:56:00 1.151.2.32
+++ configure.in 2005/11/25 02:00:33 1.151.2.33
@@ -3592,7 +3592,7 @@ dnl Not all toolkits support all widgets
dnl Avoid using Motif :-(
case "$opsys" in
- *linux* ) lucid_prefers_motif="no" ;;
+ *linux* | cygwin* ) lucid_prefers_motif="no" ;;
* ) lucid_prefers_motif="yes" ;;
esac
@@ -4454,6 +4454,24 @@ test "$with_database_gdbm" = "yes" -o \
"$with_database_dbm" = "yes" && \
AC_DEFINE(HAVE_DBM)
+dnl Check for u_int*_t typedefs.
+AC_CHECK_TYPE(u_int8_t, uint8_t)
+if test $ac_cv_type_u_int8_t = yes; then
+AC_DEFINE(HAVE_U_INT8_T,1)
+fi
+AC_CHECK_TYPE(u_int16_t, uint16_t)
+if test $ac_cv_type_u_int16_t = yes; then
+AC_DEFINE(HAVE_U_INT16_T,1)
+fi
+AC_CHECK_TYPE(u_int32_t, uint32_t)
+if test $ac_cv_type_u_int32_t = yes; then
+AC_DEFINE(HAVE_U_INT32_T,1)
+fi
+AC_CHECK_TYPE(u_int64_t, uint64_t)
+if test $ac_cv_type_u_int64_t = yes; then
+AC_DEFINE(HAVE_U_INT64_T,1)
+fi
+
dnl Check for Berkeley DB.
if test "$with_database_berkdb" != "no"; then
AC_MSG_CHECKING(for Berkeley db.h)
@@ -4478,11 +4496,19 @@ if test "$with_database_berkdb" != "no";
#ifdef HAVE_INTTYPES_H
#define __BIT_TYPES_DEFINED__
#include <inttypes.h>
+#if !HAVE_U_INT8_T
typedef uint8_t u_int8_t;
+#endif
+#if !HAVE_U_INT16_T
typedef uint16_t u_int16_t;
+#endif
+#if !HAVE_U_INT32_T
typedef uint32_t u_int32_t;
+#endif
#ifdef WE_DONT_NEED_QUADS
+#if !HAVE_U_INT64_T
typedef uint64_t u_int64_t;
+#endif
#endif
#endif
#endif
1.8.4.7 +6 -0 XEmacs/xemacs/etc/Attic/PACKAGES
Index: PACKAGES
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/Attic/PACKAGES,v
retrieving revision 1.8.4.6
retrieving revision 1.8.4.7
diff -u -p -r1.8.4.6 -r1.8.4.7
--- PACKAGES 2005/02/19 22:01:59 1.8.4.6
+++ PACKAGES 2005/11/25 02:01:46 1.8.4.7
@@ -234,6 +234,9 @@ Deprecated collection of DTDs for psgml.
*** python-modes
Python support.
+*** re-builder
+Interactive development tool for regular expressions.
+
*** reftex
Emacs support for LaTeX cross-references, citations.
@@ -340,6 +343,9 @@ Fundamental XEmacs support, you almost c
XEmacs Lisp developer support. This package contains utilities for
supporting Lisp development. It is a single-file package so it may be
tailored.
+
+*** xetla
+(setq mm-coding-system-priorities '(iso-8859-1 iso-8859-15 utf-8))
*** xlib
Emacs interface to X server.
1.266.2.83 +19 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.266.2.82
retrieving revision 1.266.2.83
diff -u -p -r1.266.2.82 -r1.266.2.83
--- ChangeLog 2005/02/24 03:06:06 1.266.2.82
+++ ChangeLog 2005/11/25 02:01:48 1.266.2.83
@@ -1,3 +1,22 @@
+2005-06-06 Adrian Aichner <adrian(a)xemacs.org>
+
+ * package-get.el (package-get-init-package):
+ package-get-init-package buglet (21.4.17) by Jeff Mincy
+ <mincy(a)rcn.com> fixing false temporary load-path shadows reported
+ after package installation and simplifying code.
+
+2005-10-18 Ville Skyttä <scop(a)xemacs.org>
+
+ * package-get.el (package-get-download-sites): Sync mirrors list
+ with the XEmacs website.
+ (package-get-pre-release-download-sites): Ditto.
+
+2005-04-06 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * derived.el (derived-mode-merge-syntax-tables):
+ Revert my 21.5-only patch of 2003-07-18 which slipped in
+ through Jerry James's patch of 2004-06-07.
+
2005-02-23 Adrian Aichner <adrian(a)xemacs.org>
* cmdloop.el (keyboard-quit): Remove workaround for
1.4.2.2 +6 -14 XEmacs/xemacs/lisp/derived.el
Index: derived.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/derived.el,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -p -r1.4.2.1 -r1.4.2.2
--- derived.el 2004/06/22 01:49:47 1.4.2.1
+++ derived.el 2005/11/25 02:01:49 1.4.2.2
@@ -421,20 +421,12 @@ Where the new table already has an entry
;; check for inheritance.
(map-char-table
#'(lambda (key value)
- (let ((newval (get-range-char-table key new 'multi)))
- (cond ((eq newval 'multi) ; OK, dive into the class hierarchy
- (map-char-table
- #'(lambda (key1 value1)
- (when (eq ?@ (char-syntax-from-code
- (get-range-char-table key new ?@)))
- (put-char-table key1 value new))
- nil)
- new
- key))
- ((eq ?@ (char-syntax-from-code newval)) ;; class at once
- (put-char-table key value new))))
- nil)
- old))
+ (if (eq ?@ (char-syntax-from-code value))
+ (map-char-table #'(lambda (key1 value1)
+ (put-char-table key1 value1 new))
+ old
+ key)))
+ new))
;; Merge an old abbrev table into a new one.
;; This function requires internal knowledge of how abbrev tables work,
1.39.2.10 +13 -19 XEmacs/xemacs/lisp/package-get.el
Index: package-get.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/package-get.el,v
retrieving revision 1.39.2.9
retrieving revision 1.39.2.10
diff -u -p -r1.39.2.9 -r1.39.2.10
--- package-get.el 2004/06/28 01:19:56 1.39.2.9
+++ package-get.el 2005/11/25 02:01:49 1.39.2.10
@@ -204,6 +204,7 @@ directory."
("US (Main XEmacs Site)"
"ftp.xemacs.org" "pub/xemacs/packages")
;; In alphabetical order of Country, our mirrors...
+ ("Argentina (xmundo.net)" "xemacs.xmundo.net"
"pub/mirrors/xemacs/packages")
("Australia (aarnet.edu.au)" "mirror.aarnet.edu.au"
"pub/xemacs/packages")
("Australia (au.xemacs.org)" "ftp.au.xemacs.org"
"pub/xemacs/packages")
("Austria (at.xemacs.org)" "ftp.at.xemacs.org"
"editors/xemacs/packages")
@@ -211,7 +212,7 @@ directory."
("Brazil (br.xemacs.org)" "ftp.br.xemacs.org"
"pub/xemacs/packages")
("Canada (ca.xemacs.org)" "ftp.ca.xemacs.org"
"pub/Mirror/xemacs/packages")
("Canada (crc.ca)" "ftp.crc.ca"
"pub/packages/editors/xemacs/packages")
- ("Canada (ualberta.ca)" "sunsite.ualberta.ca"
"pub/Mirror/xemacs/packages")
+ ("Canada (nrc.ca)" "ftp.nrc.ca"
"pub/packages/editors/xemacs/packages")
("Czech Republic (cz.xemacs.org)" "ftp.cz.xemacs.org"
"MIRRORS/ftp.xemacs.org/pub/xemacs/packages")
("Denmark (dk.xemacs.org)" "ftp.dk.xemacs.org"
"pub/emacs/xemacs/packages")
("Finland (fi.xemacs.org)" "ftp.fi.xemacs.org"
"pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/packages")
@@ -219,8 +220,9 @@ directory."
("France (mirror.cict.fr)" "mirror.cict.fr"
"xemacs/packages")
("France (pasteur.fr)" "ftp.pasteur.fr"
"pub/computing/xemacs/packages")
("Germany (de.xemacs.org)" "ftp.de.xemacs.org"
"pub/ftp.xemacs.org/tux/xemacs/packages")
- ("Germany (tu-darmstadt.de)" "ftp.tu-darmstadt.de"
"pub/editors/xemacs/packages")
+ ("Iceland (is.xemacs.org)" "ftp.is.xemacs.org"
"pub/xemacs/packages")
("Ireland (ie.xemacs.org)" "ftp.ie.xemacs.org"
"mirrors/ftp.xemacs.org/pub/xemacs/packages")
+ ("Ireland (heanet.ie)" "ftp.heanet.ie"
"mirrors/ftp.xemacs.org/packages")
("Italy (it.xemacs.org)" "ftp.it.xemacs.org"
"unix/packages/XEMACS/packages")
("Japan (aist.go.jp)" "ring.aist.go.jp"
"pub/text/xemacs/packages")
("Japan (asahi-net.or.jp)" "ring.asahi-net.or.jp"
"pub/text/xemacs/packages")
@@ -234,7 +236,6 @@ directory."
("Norway (no.xemacs.org)" "ftp.no.xemacs.org"
"pub/xemacs/packages")
("Poland (pl.xemacs.org)" "ftp.pl.xemacs.org"
"pub/unix/editors/xemacs/packages")
("Russia (ru.xemacs.org)" "ftp.ru.xemacs.org"
"pub/xemacs/packages")
- ("Slovakia (sk.xemacs.org)" "ftp.sk.xemacs.org"
"pub/mirrors/xemacs/packages")
("South Africa (za.xemacs.org)" "ftp.za.xemacs.org"
"mirrorsites/ftp.xemacs.org/packages")
("Sweden (se.xemacs.org)" "ftp.se.xemacs.org"
"pub/gnu/xemacs/packages")
("Switzerland (ch.xemacs.org)" "ftp.ch.xemacs.org"
"mirror/xemacs/packages")
@@ -263,6 +264,8 @@ variable actually used to specify packag
("Pre-Releases (Main XEmacs Site)" "ftp.xemacs.org"
"pub/xemacs/beta/experimental/packages")
;; In alphabetical order of Country, our mirrors...
+ ("Argentina Pre-Releases (xmundo.net)" "xemacs.xmundo.net"
+ "pub/mirrors/xemacs/beta/experimental/packages")
("Australia Pre-Releases (aarnet.edu.au)" "mirror.aarnet.edu.au"
"pub/xemacs/beta/experimental/packages")
("Australia Pre-Releases (au.xemacs.org)" "ftp.au.xemacs.org"
@@ -275,8 +278,8 @@ variable actually used to specify packag
"pub/Mirror/xemacs/beta/experimental/packages")
("Canada Pre-Releases (crc.ca)" "ftp.crc.ca"
"pub/packages/editors/xemacs/beta/experimental/packages")
- ("Canada Pre-Releases (ualberta.ca)" "sunsite.ualberta.ca"
- "pub/Mirror/xemacs/beta/experimental/packages")
+ ("Canada Pre-Releases (nrc.ca)" "ftp.nrc.ca"
+ "pub/packages/editors/xemacs/beta/experimental/packages")
("Czech Republic Pre-Releases (cz.xemacs.org)"
"ftp.cz.xemacs.org"
"MIRRORS/ftp.xemacs.org/pub/xemacs/xemacs-21.5/experimental/packages")
("Denmark Pre-Releases (dk.xemacs.org)" "ftp.dk.xemacs.org"
@@ -291,10 +294,12 @@ variable actually used to specify packag
"pub/computing/xemacs/beta/experimental/packages")
("Germany Pre-Releases (de.xemacs.org)" "ftp.de.xemacs.org"
"pub/ftp.xemacs.org/tux/xemacs/beta/experimental/packages")
- ("Germany Pre-Releases (tu-darmstadt.de)" "ftp.tu-darmstadt.de"
- "pub/editors/xemacs/beta/experimental/packages")
+ ("Iceland Pre-Releases (is.xemacs.org)" "ftp.is.xemacs.org"
+ "pub/xemacs/beta/experimental/packages")
("Ireland Pre-Releases (ie.xemacs.org)" "ftp.ie.xemacs.org"
"mirrors/ftp.xemacs.org/pub/xemacs/beta/experimental/packages")
+ ("Ireland Pre-Releases (heanet.ie)" "ftp.heanet.ie"
+ "mirrors/ftp.xemacs.org/beta/experimental/packages")
("Italy Pre-Releases (it.xemacs.org)" "ftp.it.xemacs.org"
"unix/packages/XEMACS/beta/experimental/packages")
("Japan Pre-Releases (aist.go.jp)" "ring.aist.go.jp"
@@ -316,10 +321,6 @@ variable actually used to specify packag
"pub/unix/editors/xemacs/beta/experimental/packages")
("Russia Pre-Releases (ru.xemacs.org)" "ftp.ru.xemacs.org"
"pub/xemacs/beta/experimental/packages")
- ("Saudi Arabia Pre-Releases (sa.xemacs.org)" "ftp.sa.xemacs.org"
- "pub/mirrors/ftp.xemacs.org/xemacs/xemacs-21.5/experimental/packages")
- ("Slovakia Pre-Releases (sk.xemacs.org)" "ftp.sk.xemacs.org"
- "pub/mirrors/xemacs/beta/experimental/packages")
("South Africa Pre-Releases (za.xemacs.org)" "ftp.za.xemacs.org"
"mirrorsites/ftp.xemacs.org/beta/experimental/packages")
("Sweden Pre-Releases (se.xemacs.org)" "ftp.se.xemacs.org"
@@ -844,14 +845,7 @@ Return `t' upon complete success, `nil'
(progn
;; Add lispdir to load-path if it doesn't already exist.
;; NOTE: this does not take symlinks, etc., into account.
- (if (let ((dirs load-path))
- (catch 'done
- (while dirs
- (if (string-equal (car dirs) lispdir)
- (throw 'done nil))
- (setq dirs (cdr dirs)))
- t))
- (setq load-path (cons lispdir load-path)))
+ (add-to-list 'load-path (file-name-as-directory lispdir))
(if (not (package-get-load-package-file lispdir "auto-autoloads"))
(package-get-load-package-file lispdir "_pkg"))
t)
1.290.2.96 +44 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.290.2.95
retrieving revision 1.290.2.96
diff -u -p -r1.290.2.95 -r1.290.2.96
--- ChangeLog 2005/02/14 04:15:31 1.290.2.95
+++ ChangeLog 2005/11/25 02:01:53 1.290.2.96
@@ -1,3 +1,47 @@
+2005-07-11 Malcolm Purvis <malcolmp(a)xemacs.org>
+
+ * glyphs-gtk.c: Rename a local static variable because gcc 4.0
+ says it clashes with a global with the same name.
+
+2005-07-11 Atanu Ghosh <atanu(a)icsi.berkeley.edu>
+
+ * sysdll.c (dll_open): Under MacOS X return NULL under the
+ filename is NULL. Fixes problems finding local symbols under 10.4
+ (Tiger)
+
+2005-11-15 Dr. Volker Zell <Dr.Volker.Zell(a)oracle.com>
+
+ * config.h.in: New HAVE_U_INT*_T defines.
+
+ * database.c: Only use u_int*_t typedefs if not already
+ defined.
+
+2005-04-07 15:08 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
+
+ * src/process-unix.c (unix_open_network_stream): moved
+ 'portbuf' buffer out of an inner block as it is used in the
+ entire function. With gcc4, the stack may get corrupted
+ after leaving this block. This patches adjusts the size of
+ the used buffer also; static '128' bytes are far too much
+ currently and might not suffice for future architectures
+ (e.g. for 512 bit ones ;)). Instead of, use only the really
+ required space (max octets * ln(256)/ln(10) chars + space
+ for '\0' and the sign)
+
+2005-04-08 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * callproc.c: Include sysdir.h, so any necessary Mule processing
+ is done on the current directory name before starting a new
+ process.
+
+2005-04-06 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * chartab.c (Fchar_table_p):
+ (Fget_range_char_table):
+ (Fput_char_table):
+ (Fmap_char_table):
+ Describe range representation and fix typo.
+
2005-02-12 Vin Shelton <acs(a)xemacs.org>
* emacs.c (shut_down_emacs): Advise users to send email to the
1.37.2.3 +1 -0 XEmacs/xemacs/src/Attic/callproc.c
Index: callproc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/callproc.c,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -u -p -r1.37.2.2 -r1.37.2.3
--- callproc.c 2002/10/31 15:07:30 1.37.2.2
+++ callproc.c 2005/11/25 02:01:56 1.37.2.3
@@ -48,6 +48,7 @@ Boston, MA 02111-1307, USA. */
#include "systime.h"
#include "sysproc.h"
#include "sysfile.h" /* Always include after sysproc.h */
+#include "sysdir.h"
#include "syssignal.h" /* Always include before systty.h */
#include "systty.h"
1.14.2.2 +22 -10 XEmacs/xemacs/src/chartab.c
Index: chartab.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/chartab.c,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -p -r1.14.2.1 -r1.14.2.2
--- chartab.c 2005/01/31 02:55:05 1.14.2.1
+++ chartab.c 2005/11/25 02:01:56 1.14.2.2
@@ -457,15 +457,17 @@ once per character).
When Mule support exists, the types of ranges that can be assigned
values are
--- all characters
+-- all characters (represented by t)
-- an entire charset
--- a single row in a two-octet charset
+-- a single row in a two-octet charset (represented by a vector of two
+ elements: a two-octet charset and a row number; the row must be an
+ integer, not a character)
-- a single character
When Mule support is not present, the types of ranges that can be
assigned values are
--- all characters
+-- all characters (represented by t)
-- a single character
To create a char table, use `make-char-table'.
@@ -853,8 +855,11 @@ Find value for CHARACTER in CHAR-TABLE.
}
DEFUN ("get-range-char-table", Fget_range_char_table, 2, 3, 0, /*
-Find value for a range in CHAR-TABLE.
+Find value for RANGE in CHAR-TABLE.
If there is more than one value, return MULTI (defaults to nil).
+
+Valid values for RANGE are single characters, charsets, a row in a
+two-octet charset, and all characters. See `put-char-table'.
*/
(range, char_table, multi))
{
@@ -1142,8 +1147,9 @@ one of the following:
-- t (all characters are affected)
-- A charset (only allowed when Mule support is present)
--- A vector of two elements: a two-octet charset and a row number
- (only allowed when Mule support is present)
+-- A vector of two elements: a two-octet charset and a row number; the row
+ must be an integer, not a character (only allowed when Mule support is
+ present)
-- A single character
VALUE must be a value appropriate for the type of CHAR-TABLE.
@@ -1437,12 +1443,18 @@ slow_map_char_table_fun (struct chartab_
}
DEFUN ("map-char-table", Fmap_char_table, 2, 3, 0, /*
-Map FUNCTION over entries in CHAR-TABLE, calling it with two args,
-each key and value in the table.
+Map FUNCTION over CHAR-TABLE until it returns non-nil; return that value.
+FUNCTION is called with two arguments, each key and entry in the table.
-RANGE specifies a subrange to map over and is in the same format as
-the RANGE argument to `put-range-table'. If omitted or t, it defaults to
+RANGE specifies a subrange to map over. If omitted or t, it defaults to
the entire table.
+
+Both RANGE and the keys passed to FUNCTION are in the same format as the
+RANGE argument to `put-char-table'. N.B. This function does NOT map over
+all characters in RANGE, but over the subranges that have been assigned to.
+Thus this function is most suitable for searching a char-table, or for
+populating one char-table based on the contents of another. The current
+implementation does not coalesce ranges all of whose values are the same.
*/
(function, char_table, range))
{
1.61.2.8 +9 -0 XEmacs/xemacs/src/config.h.in
Index: config.h.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v
retrieving revision 1.61.2.7
retrieving revision 1.61.2.8
diff -u -p -r1.61.2.7 -r1.61.2.8
--- config.h.in 2003/08/18 01:42:10 1.61.2.7
+++ config.h.in 2005/11/25 02:01:56 1.61.2.8
@@ -422,6 +422,15 @@ void *alloca ();
/* Compile in support for DBM databases? May require libgdbm or libdbm. */
#undef HAVE_DBM
+/* Define to 1 if the system has the type `u_int8_t'. */
+#undef HAVE_U_INT8_T
+/* Define to 1 if the system has the type `u_int16_t'. */
+#undef HAVE_U_INT16_T
+/* Define to 1 if the system has the type `u_int32_t'. */
+#undef HAVE_U_INT32_T
+/* Define to 1 if the system has the type `u_int64_t'. */
+#undef HAVE_U_INT64_T
+
/* Compile in support for Berkeley DB style databases? May require libdb. */
#undef HAVE_BERKELEY_DB
/* Full #include file path for Berkeley DB's db.h */
1.16.2.5 +8 -0 XEmacs/xemacs/src/database.c
Index: database.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/database.c,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -u -p -r1.16.2.4 -r1.16.2.5
--- database.c 2003/06/19 03:34:42 1.16.2.4
+++ database.c 2005/11/25 02:01:57 1.16.2.5
@@ -46,13 +46,21 @@ Boston, MA 02111-1307, USA. */
#define __BIT_TYPES_DEFINED__
#include <inttypes.h>
#ifndef __FreeBSD__
+#if !HAVE_U_INT8_T
typedef uint8_t u_int8_t;
+#endif
+#if !HAVE_U_INT16_T
typedef uint16_t u_int16_t;
+#endif
+#if !HAVE_U_INT32_T
typedef uint32_t u_int32_t;
+#endif
#ifdef WE_DONT_NEED_QUADS
+#if !HAVE_U_INT64_T
typedef uint64_t u_int64_t;
#endif
#endif /* WE_DONT_NEED_QUADS */
+#endif /* !defined(__FreeBSD__) */
#endif /* HAVE_INTTYPES_H */
#endif /* !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) */
/* Berkeley DB wants __STDC__ to be defined; else if does `#define const' */
1.2.2.5 +3 -3 XEmacs/xemacs/src/glyphs-gtk.c
Index: glyphs-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-gtk.c,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -p -r1.2.2.4 -r1.2.2.5
--- glyphs-gtk.c 2005/01/31 02:55:17 1.2.2.4
+++ glyphs-gtk.c 2005/11/25 02:01:57 1.2.2.5
@@ -2999,7 +2999,7 @@ complex_vars_of_glyphs_gtk (void)
/* shared data for the image read/parse logic */
static short hexTable[256]; /* conversion value */
-static int initialized = FALSE; /* easier to fill in at run time */
+static int hexTable_initialized = FALSE; /* easier to fill in at run time */
/*
* Table index for the hex values. Initialized once, first time.
@@ -3032,7 +3032,7 @@ static void initHexTable()
hexTable['}'] = -1; hexTable['\n'] = -1;
hexTable['\t'] = -1;
- initialized = TRUE;
+ hexTable_initialized = TRUE;
}
/*
@@ -3089,7 +3089,7 @@ int read_bitmap_data (fstream, width, he
#define Xmalloc(size) malloc(size)
/* first time initialization */
- if (initialized == FALSE) initHexTable();
+ if (hexTable_initialized == FALSE) initHexTable();
/* error cleanup and return macro */
#define RETURN(code) { if (data) free (data); return code; }
1.20.2.10 +1 -1 XEmacs/xemacs/src/process-unix.c
Index: process-unix.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/process-unix.c,v
retrieving revision 1.20.2.9
retrieving revision 1.20.2.10
diff -u -p -r1.20.2.9 -r1.20.2.10
--- process-unix.c 2005/02/12 02:56:50 1.20.2.9
+++ process-unix.c 2005/11/25 02:01:57 1.20.2.10
@@ -1684,13 +1684,13 @@ unix_open_network_stream (Lisp_Object na
volatile int xerrno = 0;
volatile int failed_connect = 0;
char *ext_host;
+ char portbuf[sizeof(long)*3 + 2];
/*
* Caution: service can either be a string or int.
* Convert to a C string for later use by getaddrinfo.
*/
if (INTP (service))
{
- char portbuf[128];
snprintf (portbuf, sizeof (portbuf), "%ld", (long) XINT (service));
portstring = portbuf;
port = htons ((unsigned short) XINT (service));
1.7.2.7 +14 -2 XEmacs/xemacs/src/sysdll.c
Index: sysdll.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysdll.c,v
retrieving revision 1.7.2.6
retrieving revision 1.7.2.7
diff -u -p -r1.7.2.6 -r1.7.2.7
--- sysdll.c 2004/03/25 21:08:19 1.7.2.6
+++ sysdll.c 2005/11/25 02:01:58 1.7.2.7
@@ -263,11 +263,23 @@ dll_handle
dll_open (const char *fname)
{
NSObjectFileImage file;
- NSObjectFileImageReturnCode ret =
- NSCreateObjectFileImageFromFile(fname, &file);
+ NSObjectFileImageReturnCode ret;
+
+ /*
+ * MacOS X dll support is for bundles, not the current executable, so return
+ * NULL is this case. However, dll_function() uses a special hack where a
+ * NULL handle can be used to find executable symbols. This satisfies the
+ * needs of ui-gtk.c but is not a general solution.
+ */
+ if (fname == NULL)
+ return NULL;
+
+ ret = NSCreateObjectFileImageFromFile(fname, &file);
+
if (ret != NSObjectFileImageSuccess) {
return NULL;
}
+
return (dll_handle)NSLinkModule(file, fname,
NSLINKMODULE_OPTION_BINDNOW |
NSLINKMODULE_OPTION_PRIVATE |