Mercurial > hg > xemacs-beta
changeset 800:a5954632b187
[xemacs-hg @ 2002-03-31 08:27:14 by ben]
more fixes, first crack at finishing behavior implementation
TODO.ben-mule-21-5: Update.
configure.in: Fix for new error-checking types.
make-mswin-unicode.pl: Don't be fucked up by CRLF. Output code
to force errors when nonintercepted Windows calls issued.
behavior.el, dumped-lisp.el, menubar-items.el: Add support for saving using custom. Load into a dumped XEmacs.
Correct :title to :short-doc in accordance with behavior-defs.el.
Add a submenu under Options for turning on/off behaviors.
cl-macs.el: Properly document `loop'. Fix a minor bug in keymap iteration and
add support for bit-vector iteration.
lisp-mode.el: Rearrange and add items for macro expanding.
menubar-items.el: Document connection between these two functions.
window.el: Port stuff from GNU 21.1.
config.inc.samp, xemacs.mak: Separate out and add new variable for controlling error-checking.
s/windowsnt.h: Use new ERROR_CHECK_ALL; not related to DEBUG_XEMACS.
alloc.c, backtrace.h, buffer.c, buffer.h, bytecode.c, callproc.c, casetab.c, charset.h, chartab.c, cmdloop.c, config.h.in, console-msw.c, console-stream.c, console-tty.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dired-msw.c, dired.c, dumper.c, editfns.c, eldap.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, file-coding.h, fileio.c, frame-msw.c, frame.c, frame.h, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, insdel.c, intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, intl-win32.c, keymap.c, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-x.c, menubar.c, mule-coding.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, opaque.c, print.c, process-nt.c, process-unix.c, process.c, rangetab.c, redisplay-msw.c, redisplay-output.c, redisplay.c, regex.c, scrollbar-msw.c, select-msw.c, signal.c, specifier.c, specifier.h, symbols.c, sysdep.c, syswindows.h, text.c, text.h, toolbar-msw.c, tooltalk.c, ui-gtk.c, unicode.c, window.c: Redo error-checking macros: ERROR_CHECK_TYPECHECK ->
ERROR_CHECK_TYPES, ERROR_CHECK_CHARBPOS -> ERROR_CHECK_TEXT, add
ERROR_CHECK_DISPLAY, ERROR_CHECK_STRUCTURES. Document these in
config.h.in. Fix code to follow docs. Fix *_checking_assert()
in accordance with new names.
Attempt to fix periodic redisplay crash freeing display line
structures. Add first implementation of sledgehammer redisplay
check.
Redo print_*() to use write_fmt_string(), write_fmt_string_lisp().
Fix bug in md5 handling.
Rename character-to-unicode to char-to-unicode; same for
unicode-to-char{acter}.
Move chartab documentation to `make-char-table'.
Some header cleanup.
Clean up remaining places where nonintercepted Windows calls are
being used.
automated/mule-tests.el: Fix for new Unicode support.
line wrap: on
line diff
--- a/ChangeLog Sat Mar 30 04:46:48 2002 +0000 +++ b/ChangeLog Sun Mar 31 08:30:17 2002 +0000 @@ -1,3 +1,12 @@ +2002-03-31 Ben Wing <ben@xemacs.org> + + * TODO.ben-mule-21-5 (bugs): Update. + + * configure.in (USAGE_ERROR): + * configure.in (CANONICALIZE_PATH): + * configure.in (XE_COMPUTE_RUNPATH): + Fix for new error-checking types. + 2002-03-28 Ben Wing <ben@xemacs.org> * etc/ChangeLog: New file.
--- a/TODO.ben-mule-21-5 Sat Mar 30 04:46:48 2002 +0000 +++ b/TODO.ben-mule-21-5 Sun Mar 31 08:30:17 2002 +0000 @@ -11,16 +11,6 @@ -- Memory ballooning in some cases. Not yet understood. --- Occasional crash when freeing display structures. The problem seems to - be this: A window has a "display line dynarr"; each display line has a - "display block dynarr". Sometimes this display block dynarr is getting - freed twice. It appears from looking at the code that sometimes a - display line from somewhere in the dynarr gets added to the end -- hence - two pointers to the same display block dynarr. need to review this - code. - --- md5 doesn't work. (Lstream not open errors) Causes w3 to fail. - -- other test suite failures? -- need to review the handling of sounds. seems that not everything is @@ -35,6 +25,23 @@ -- problems with process input: |uniq (for example) leaves ^M's at end of line. +-- carefully review looking up of fonts by charset, esp. wrt the last + element of a font spec. + +-- add package support to ignore certain files -- *-util.el for languages. + +-- review use of escape-quoted in auto_save_1() vs. the buffer's own coding + system. + +fixed bugs??? + +-- Occasional crash when freeing display structures. The problem seems to + be this: A window has a "display line dynarr"; each display line has a + "display block dynarr". Sometimes this display block dynarr is getting + freed twice. It appears from looking at the code that sometimes a + display line from somewhere in the dynarr gets added to the end -- hence + two pointers to the same display block dynarr. need to review this + code. August 29, 2001.
--- a/configure Sat Mar 30 04:46:48 2002 +0000 +++ b/configure Sun Mar 31 08:30:17 2002 +0000 @@ -535,11 +535,11 @@ extents ) error_check_extents=yes ;; noextents ) error_check_extents=no ;; - typecheck ) error_check_typecheck=yes ;; - notypecheck ) error_check_typecheck=no ;; - - charbpos ) error_check_charbpos=yes ;; - nocharbpos ) error_check_charbpos=no ;; + types ) error_check_types=yes ;; + notypes ) error_check_types=no ;; + + text ) error_check_text=yes ;; + notext ) error_check_text=no ;; gc ) error_check_gc=yes ;; nogc ) error_check_gc=no ;; @@ -550,17 +550,23 @@ byte_code ) error_check_byte_code=yes ;; nobyte_code ) error_check_byte_code=no ;; - glyphs ) error_check_glyphs=yes ;; - noglyphs ) error_check_glyphs=no ;; + glyphs ) error_check_glyphs=yes ;; + noglyphs ) error_check_glyphs=no ;; + + display ) error_check_display=yes ;; + nodisplay ) error_check_display=no ;; + + structures ) error_check_structures=yes ;; + nostructures ) error_check_structures=no ;; * ) bogus_error_check=yes ;; esac if test "$bogus_error_check" -o \ \( -n "$new_default" -a -n "$echeck_notfirst" \) ; then if test "$error_check_default" = yes ; then - types="\`all' (default), \`none', \`noextents', \`notypecheck', \`nocharbpos', \`nogc', \`nomalloc', \`noglyphs' and \`nobyte-code'." + types="\`all' (default), \`none', \`noextents', \`notypes', \`notext', \`nogc', \`nomalloc', \`noglyphs', \`nobyte-code', \`nodisplay', \`nostructures'." else - types="\`all', \`none' (default), \`extents', \`typecheck', \`charbpos', \`gc', \`malloc', \`glyphs' and \`byte-code'." + types="\`all', \`none' (default), \`extents', \`types', \`text', \`gc', \`malloc', \`glyphs', \`byte-code', \`display', \`structures'." fi (echo "$progname: Usage error:" echo " " "Valid types for the \`--$optname' option are: @@ -568,12 +574,14 @@ echo " Use \`$progname --help' to show usage.") >&2 && exit 1 elif test -n "$new_default" ; then error_check_extents=$new_default - error_check_typecheck=$new_default - error_check_charbpos=$new_default + error_check_types=$new_default + error_check_text=$new_default error_check_gc=$new_default error_check_malloc=$new_default error_check_byte_code=$new_default error_check_glyphs=$new_default + error_check_display=$new_default + error_check_structures=$new_default new_default= # reset this fi echeck_notfirst=true @@ -848,7 +856,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:852: checking whether ln -s works" >&5 +echo "configure:860: checking whether ln -s works" >&5 rm -f conftestdata if ln -s X conftestdata 2>/dev/null @@ -1021,7 +1029,7 @@ if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi -test "${error_check_extents=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF +test "${error_check_extents=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF Defining ERROR_CHECK_EXTENTS EOF cat >> confdefs.h <<\EOF @@ -1029,23 +1037,23 @@ EOF } -test "${error_check_typecheck=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF - Defining ERROR_CHECK_TYPECHECK -EOF -cat >> confdefs.h <<\EOF -#define ERROR_CHECK_TYPECHECK 1 -EOF -} - -test "${error_check_charbpos=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF - Defining ERROR_CHECK_CHARBPOS -EOF -cat >> confdefs.h <<\EOF -#define ERROR_CHECK_CHARBPOS 1 -EOF -} - -test "${error_check_gc=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF +test "${error_check_types=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF + Defining ERROR_CHECK_TYPES +EOF +cat >> confdefs.h <<\EOF +#define ERROR_CHECK_TYPES 1 +EOF +} + +test "${error_check_text=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF + Defining ERROR_CHECK_TEXT +EOF +cat >> confdefs.h <<\EOF +#define ERROR_CHECK_TEXT 1 +EOF +} + +test "${error_check_gc=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF Defining ERROR_CHECK_GC EOF cat >> confdefs.h <<\EOF @@ -1053,7 +1061,7 @@ EOF } -test "${error_check_malloc=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF +test "${error_check_malloc=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF Defining ERROR_CHECK_MALLOC EOF cat >> confdefs.h <<\EOF @@ -1061,7 +1069,7 @@ EOF } -test "${error_check_byte_code=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF +test "${error_check_byte_code=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF Defining ERROR_CHECK_BYTE_CODE EOF cat >> confdefs.h <<\EOF @@ -1069,7 +1077,7 @@ EOF } -test "${error_check_glyphs=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF +test "${error_check_glyphs=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF Defining ERROR_CHECK_GLYPHS EOF cat >> confdefs.h <<\EOF @@ -1077,6 +1085,22 @@ EOF } +test "${error_check_display=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF + Defining ERROR_CHECK_DISPLAY +EOF +cat >> confdefs.h <<\EOF +#define ERROR_CHECK_DISPLAY 1 +EOF +} + +test "${error_check_structures=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF + Defining ERROR_CHECK_STRUCTURES +EOF +cat >> confdefs.h <<\EOF +#define ERROR_CHECK_STRUCTURES 1 +EOF +} + if test "${debug:=$beta}" = "yes"; then use_assertions=yes memory_usage_stats=yes @@ -1108,7 +1132,7 @@ echo $ac_n "checking "host system type"""... $ac_c" 1>&6 -echo "configure:1112: checking "host system type"" >&5 +echo "configure:1136: checking "host system type"" >&5 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'` canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"` configuration=`echo "$configuration" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'` @@ -1617,7 +1641,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1621: checking for $ac_word" >&5 +echo "configure:1645: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1644,7 +1668,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1648: checking for $ac_word" >&5 +echo "configure:1672: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1692,7 +1716,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1696: checking for $ac_word" >&5 +echo "configure:1720: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1721,7 +1745,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1725: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1749: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' @@ -1734,12 +1758,12 @@ cat > conftest.$ac_ext << EOF -#line 1738 "configure" +#line 1762 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1767,19 +1791,19 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1795: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1776: checking whether we are using GNU C" >&5 +echo "configure:1800: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1797,7 +1821,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1801: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1825: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1830,7 +1854,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1834: checking for $ac_word" >&5 +echo "configure:1858: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1857,7 +1881,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1861: checking for $ac_word" >&5 +echo "configure:1885: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1905,7 +1929,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1909: checking for $ac_word" >&5 +echo "configure:1933: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1934,7 +1958,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1938: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1962: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' @@ -1947,12 +1971,12 @@ cat > conftest.$ac_ext << EOF -#line 1951 "configure" +#line 1975 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1980,19 +2004,19 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1984: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2008: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1989: checking whether we are using GNU C" >&5 +echo "configure:2013: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2010,7 +2034,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2014: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2038: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -2043,7 +2067,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2047: checking for $ac_word" >&5 +echo "configure:2071: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2070,7 +2094,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2074: checking for $ac_word" >&5 +echo "configure:2098: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2118,7 +2142,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2122: checking for $ac_word" >&5 +echo "configure:2146: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2147,7 +2171,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2151: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2175: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' @@ -2160,12 +2184,12 @@ cat > conftest.$ac_ext << EOF -#line 2164 "configure" +#line 2188 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2193,19 +2217,19 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2197: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2221: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2202: checking whether we are using GNU C" >&5 +echo "configure:2226: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2223,7 +2247,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2227: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2251: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -2260,7 +2284,7 @@ test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2264: checking how to run the C preprocessor" >&5 +echo "configure:2288: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2273,13 +2297,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2277 "configure" +#line 2301 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2307: \"$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 : @@ -2290,13 +2314,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2294 "configure" +#line 2318 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2324: \"$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 : @@ -2307,13 +2331,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 2311 "configure" +#line 2335 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2341: \"$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 : @@ -2339,9 +2363,9 @@ echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:2343: checking for AIX" >&5 -cat > conftest.$ac_ext <<EOF -#line 2345 "configure" +echo "configure:2367: checking for AIX" >&5 +cat > conftest.$ac_ext <<EOF +#line 2369 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -2368,9 +2392,9 @@ echo $ac_n "checking for GNU libc""... $ac_c" 1>&6 -echo "configure:2372: checking for GNU libc" >&5 -cat > conftest.$ac_ext <<EOF -#line 2374 "configure" +echo "configure:2396: checking for GNU libc" >&5 +cat > conftest.$ac_ext <<EOF +#line 2398 "configure" #include "confdefs.h" #include <features.h> int main() { @@ -2382,7 +2406,7 @@ ; return 0; } EOF -if { (eval echo configure:2386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_glibc=yes else @@ -2459,7 +2483,7 @@ esac cat > conftest.$ac_ext <<EOF -#line 2463 "configure" +#line 2487 "configure" #include "confdefs.h" int main () { #if defined __SUNPRO_C @@ -2473,7 +2497,7 @@ #endif } EOF -if { (eval echo configure:2477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:2501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -2725,17 +2749,17 @@ if test "$__USLC__" = yes; then echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6 -echo "configure:2729: checking for whether the -Kalloca compiler flag is needed" >&5 +echo "configure:2753: checking for whether the -Kalloca compiler flag is needed" >&5 need_kalloca=no cat > conftest.$ac_ext <<EOF -#line 2732 "configure" +#line 2756 "configure" #include "confdefs.h" int main() { void *x = alloca(4); ; return 0; } EOF -if { (eval echo configure:2739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* : else @@ -2746,14 +2770,14 @@ xe_save_c_switch_system="$c_switch_system" c_switch_system="$c_switch_system -Kalloca" cat > conftest.$ac_ext <<EOF -#line 2750 "configure" +#line 2774 "configure" #include "confdefs.h" int main() { void *x = alloca(4); ; return 0; } EOF -if { (eval echo configure:2757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* need_kalloca=yes else @@ -2791,7 +2815,7 @@ if test "$GCC" = "yes"; then echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6 -echo "configure:2795: checking for buggy gcc versions" >&5 +echo "configure:2819: checking for buggy gcc versions" >&5 GCC_VERSION=`$CC --version` case `uname -s`:`uname -m`:$GCC_VERSION in *:sun4*:2.8.1|*:sun4*:egcs-2.90.*) @@ -2914,7 +2938,7 @@ fi echo $ac_n "checking for dynodump""... $ac_c" 1>&6 -echo "configure:2918: checking for dynodump" >&5 +echo "configure:2942: checking for dynodump" >&5 if test "$unexec" != "unexsol2.o"; then echo "$ac_t""no" 1>&6 else @@ -2952,12 +2976,12 @@ done echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6 -echo "configure:2956: checking for terminateAndUnload in -lC" >&5 +echo "configure:2980: checking for terminateAndUnload in -lC" >&5 ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'` xe_check_libs=" -lC " cat > conftest.$ac_ext <<EOF -#line 2961 "configure" +#line 2985 "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 @@ -2968,7 +2992,7 @@ terminateAndUnload() ; return 0; } EOF -if { (eval echo configure:2972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2996: \"$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 @@ -3076,7 +3100,7 @@ if test "$add_runtime_path" = "yes"; then echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6 -echo "configure:3080: checking "for runtime libraries flag"" >&5 +echo "configure:3104: checking "for runtime libraries flag"" >&5 case "$opsys" in sol2 ) dash_r="-R" ;; decosf* | linux* | irix*) dash_r="-rpath " ;; @@ -3098,14 +3122,14 @@ done fi cat > conftest.$ac_ext <<EOF -#line 3102 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +#line 3126 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:3133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* dash_r="$try_dash_r" else @@ -3206,10 +3230,10 @@ fi after_morecore_hook_exists=yes echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6 -echo "configure:3210: checking for malloc_set_state" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3213 "configure" +echo "configure:3234: checking for malloc_set_state" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3237 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char malloc_set_state(); below. */ @@ -3232,7 +3256,7 @@ ; return 0; } EOF -if { (eval echo configure:3236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_malloc_set_state=yes" else @@ -3252,16 +3276,16 @@ fi echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6 -echo "configure:3256: checking whether __after_morecore_hook exists" >&5 -cat > conftest.$ac_ext <<EOF -#line 3258 "configure" +echo "configure:3280: checking whether __after_morecore_hook exists" >&5 +cat > conftest.$ac_ext <<EOF +#line 3282 "configure" #include "confdefs.h" extern void (* __after_morecore_hook)(); int main() { __after_morecore_hook = 0 ; return 0; } EOF -if { (eval echo configure:3265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -3317,7 +3341,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3321: checking for $ac_word" >&5 +echo "configure:3345: checking for $ac_word" >&5 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -3372,7 +3396,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:3376: checking for a BSD compatible install" >&5 +echo "configure:3400: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" @@ -3426,7 +3450,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3430: checking for $ac_word" >&5 +echo "configure:3454: checking for $ac_word" >&5 if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. @@ -3458,15 +3482,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3462: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3465 "configure" +echo "configure:3486: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3489 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3494: \"$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* @@ -3496,10 +3520,10 @@ done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3500: checking for sys/wait.h that is POSIX.1 compatible" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3503 "configure" +echo "configure:3524: checking for sys/wait.h that is POSIX.1 compatible" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3527 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -3515,7 +3539,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3539,10 +3563,10 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3543: checking for ANSI C header files" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3546 "configure" +echo "configure:3567: checking for ANSI C header files" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3570 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -3550,7 +3574,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3578: \"$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* @@ -3567,7 +3591,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 3571 "configure" +#line 3595 "configure" #include "confdefs.h" #include <string.h> EOF @@ -3585,7 +3609,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 3589 "configure" +#line 3613 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -3603,7 +3627,7 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. cat > conftest.$ac_ext <<EOF -#line 3607 "configure" +#line 3631 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3614,7 +3638,7 @@ exit (0); } EOF -if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:3642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -3640,10 +3664,10 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3644: checking whether time.h and sys/time.h may both be included" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3647 "configure" +echo "configure:3668: checking whether time.h and sys/time.h may both be included" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3671 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -3652,7 +3676,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3676,10 +3700,10 @@ fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:3680: checking for sys_siglist declaration in signal.h or unistd.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3683 "configure" +echo "configure:3704: checking for sys_siglist declaration in signal.h or unistd.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3707 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -3691,7 +3715,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:3695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -3717,9 +3741,9 @@ echo $ac_n "checking for utime""... $ac_c" 1>&6 -echo "configure:3721: checking for utime" >&5 -cat > conftest.$ac_ext <<EOF -#line 3723 "configure" +echo "configure:3745: checking for utime" >&5 +cat > conftest.$ac_ext <<EOF +#line 3747 "configure" #include "confdefs.h" #include <sys/types.h> #include <utime.h> @@ -3727,7 +3751,7 @@ struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x); ; return 0; } EOF -if { (eval echo configure:3731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF @@ -3746,10 +3770,10 @@ for ac_func in utimes do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3750: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3753 "configure" +echo "configure:3774: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3777 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3772,7 +3796,7 @@ ; return 0; } EOF -if { (eval echo configure:3776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3800: \"$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 @@ -3804,10 +3828,10 @@ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3808: checking return type of signal handlers" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3811 "configure" +echo "configure:3832: checking return type of signal handlers" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3835 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -3824,7 +3848,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:3828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3852: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3846,10 +3870,10 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3850: checking for size_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3853 "configure" +echo "configure:3874: checking for size_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3877 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3880,10 +3904,10 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3884: checking for pid_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3887 "configure" +echo "configure:3908: checking for pid_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3911 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3914,10 +3938,10 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3918: checking for uid_t in sys/types.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3921 "configure" +echo "configure:3942: checking for uid_t in sys/types.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3945 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -3953,10 +3977,10 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:3957: checking for mode_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3960 "configure" +echo "configure:3981: checking for mode_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3984 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3987,10 +4011,10 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3991: checking for off_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3994 "configure" +echo "configure:4015: checking for off_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4018 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -4021,10 +4045,10 @@ fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:4025: checking for ssize_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4028 "configure" +echo "configure:4049: checking for ssize_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4052 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -4056,9 +4080,9 @@ echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:4060: checking for socklen_t" >&5 -cat > conftest.$ac_ext <<EOF -#line 4062 "configure" +echo "configure:4084: checking for socklen_t" >&5 +cat > conftest.$ac_ext <<EOF +#line 4086 "configure" #include "confdefs.h" #include <sys/socket.h> socklen_t x; @@ -4067,7 +4091,7 @@ ; return 0; } EOF -if { (eval echo configure:4071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -4076,7 +4100,7 @@ rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 4080 "configure" +#line 4104 "configure" #include "confdefs.h" #include <sys/socket.h> int accept (int, struct sockaddr *, size_t *); @@ -4085,7 +4109,7 @@ ; return 0; } EOF -if { (eval echo configure:4089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""size_t" 1>&6 @@ -4117,9 +4141,9 @@ rm -f conftest* echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:4121: checking for struct timeval" >&5 -cat > conftest.$ac_ext <<EOF -#line 4123 "configure" +echo "configure:4145: checking for struct timeval" >&5 +cat > conftest.$ac_ext <<EOF +#line 4147 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -4135,7 +4159,7 @@ static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:4139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -4157,10 +4181,10 @@ rm -f conftest* echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4161: checking whether struct tm is in sys/time.h or time.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4164 "configure" +echo "configure:4185: checking whether struct tm is in sys/time.h or time.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4188 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -4168,7 +4192,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4192,10 +4216,10 @@ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4196: checking for tm_zone in struct tm" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4199 "configure" +echo "configure:4220: checking for tm_zone in struct tm" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4223 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -4203,7 +4227,7 @@ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -4226,10 +4250,10 @@ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4230: checking for tzname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4233 "configure" +echo "configure:4254: checking for tzname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4257 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -4239,7 +4263,7 @@ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4265,10 +4289,10 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4269: checking for working const" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4272 "configure" +echo "configure:4293: checking for working const" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4296 "configure" #include "confdefs.h" int main() { @@ -4317,7 +4341,7 @@ ; return 0; } EOF -if { (eval echo configure:4321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4342,7 +4366,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:4346: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:4370: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` cat > conftestmake <<\EOF @@ -4367,12 +4391,12 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4371: checking whether byte ordering is bigendian" >&5 +echo "configure:4395: checking whether byte ordering is bigendian" >&5 ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 4376 "configure" +#line 4400 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -4383,11 +4407,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:4387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 4391 "configure" +#line 4415 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -4398,7 +4422,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:4402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4415,7 +4439,7 @@ rm -f conftest* if test $ac_cv_c_bigendian = unknown; then cat > conftest.$ac_ext <<EOF -#line 4419 "configure" +#line 4443 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -4428,7 +4452,7 @@ exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:4432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_bigendian=no else @@ -4455,10 +4479,10 @@ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:4459: checking size of short" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4462 "configure" +echo "configure:4483: checking size of short" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4486 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4469,7 +4493,7 @@ exit(0); } EOF -if { (eval echo configure:4473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_short=`cat conftestval` else @@ -4497,10 +4521,10 @@ exit 1 fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:4501: checking size of int" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4504 "configure" +echo "configure:4525: checking size of int" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4528 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4511,7 +4535,7 @@ exit(0); } EOF -if { (eval echo configure:4515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_int=`cat conftestval` else @@ -4533,10 +4557,10 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:4537: checking size of long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4540 "configure" +echo "configure:4561: checking size of long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4564 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4547,7 +4571,7 @@ exit(0); } EOF -if { (eval echo configure:4551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_long=`cat conftestval` else @@ -4569,10 +4593,10 @@ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:4573: checking size of long long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4576 "configure" +echo "configure:4597: checking size of long long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4600 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4583,7 +4607,7 @@ exit(0); } EOF -if { (eval echo configure:4587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_long_long=`cat conftestval` else @@ -4605,10 +4629,10 @@ echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:4609: checking size of void *" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4612 "configure" +echo "configure:4633: checking size of void *" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4636 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4619,7 +4643,7 @@ exit(0); } EOF -if { (eval echo configure:4623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_void_p=`cat conftestval` else @@ -4642,7 +4666,7 @@ echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:4646: checking for long file names" >&5 +echo "configure:4670: checking for long file names" >&5 ac_cv_sys_long_file_names=yes # Test for long file names in all the places we know might matter: @@ -4688,10 +4712,10 @@ echo $ac_n "checking for sin""... $ac_c" 1>&6 -echo "configure:4692: checking for sin" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4695 "configure" +echo "configure:4716: checking for sin" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4719 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char sin(); below. */ @@ -4714,7 +4738,7 @@ ; return 0; } EOF -if { (eval echo configure:4718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sin=yes" else @@ -4732,12 +4756,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:4736: checking for sin in -lm" >&5 +echo "configure:4760: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` xe_check_libs=" -lm " cat > conftest.$ac_ext <<EOF -#line 4741 "configure" +#line 4765 "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 @@ -4748,7 +4772,7 @@ sin() ; return 0; } EOF -if { (eval echo configure:4752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4776: \"$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 @@ -4792,14 +4816,14 @@ cat > conftest.$ac_ext <<EOF -#line 4796 "configure" +#line 4820 "configure" #include "confdefs.h" #include <math.h> int main() { return atanh(1.0) + asinh(1.0) + acosh(1.0); ; return 0; } EOF -if { (eval echo configure:4803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_INVERSE_HYPERBOLIC @@ -4818,10 +4842,10 @@ for ac_func in mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4822: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4825 "configure" +echo "configure:4846: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4849 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4844,7 +4868,7 @@ ; return 0; } EOF -if { (eval echo configure:4848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4872: \"$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 @@ -4873,14 +4897,14 @@ echo "checking type of mail spool file locking" 1>&6 -echo "configure:4877: checking type of mail spool file locking" >&5 +echo "configure:4901: checking type of mail spool file locking" >&5 for ac_func in lockf flock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4881: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4884 "configure" +echo "configure:4905: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4908 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4903,7 +4927,7 @@ ; return 0; } EOF -if { (eval echo configure:4907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4931: \"$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 @@ -4985,12 +5009,12 @@ case "$opsys" in decosf*) echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:4989: checking for cma_open in -lpthreads" >&5 +echo "configure:5013: checking for cma_open in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lpthreads " cat > conftest.$ac_ext <<EOF -#line 4994 "configure" +#line 5018 "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 @@ -5001,7 +5025,7 @@ cma_open() ; return 0; } EOF -if { (eval echo configure:5005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5029: \"$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 @@ -5038,7 +5062,7 @@ echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:5042: checking whether the -xildoff compiler flag is required" >&5 +echo "configure:5066: checking whether the -xildoff compiler flag is required" >&5 if ${CC-cc} '-###' -xildon no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then echo "$ac_t""no" 1>&6; @@ -5050,7 +5074,7 @@ if test "$opsys" = "sol2"; then if test "$os_release" -ge 56; then echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6 -echo "configure:5054: checking for \"-z ignore\" linker flag" >&5 +echo "configure:5078: checking for \"-z ignore\" linker flag" >&5 case "`ld -h 2>&1`" in *-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6 ld_switch_site="-z ignore $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z ignore\" to \$ld_switch_site"; fi ;; @@ -5061,7 +5085,7 @@ if test "$pdump" != "yes"; then echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6 -echo "configure:5065: checking for \"-z nocombreloc\" linker flag" >&5 +echo "configure:5089: checking for \"-z nocombreloc\" linker flag" >&5 case "`ld --help 2>&1`" in *-z\ nocombreloc* ) echo "$ac_t""yes" 1>&6 ld_switch_site="-z nocombreloc $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;; @@ -5071,7 +5095,7 @@ echo "checking "for specified window system"" 1>&6 -echo "configure:5075: checking "for specified window system"" >&5 +echo "configure:5099: checking "for specified window system"" >&5 GNOME_CONFIG=no @@ -5079,7 +5103,7 @@ if test "$with_gnome" != "no"; then echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6 -echo "configure:5083: checking for GNOME configuration script" >&5 +echo "configure:5107: checking for GNOME configuration script" >&5 for possible in gnome-config do possible_version=`${possible} --version 2> /dev/null` @@ -5110,7 +5134,7 @@ if test "$with_gtk" != "no";then echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6 -echo "configure:5114: checking for GTK configuration script" >&5 +echo "configure:5138: checking for GTK configuration script" >&5 for possible in gtk12-config gtk14-config gtk-config do possible_version=`${possible} --version 2> /dev/null` @@ -5132,18 +5156,18 @@ if test "${GTK_CONFIG}" != "no"; then echo $ac_n "checking gtk version""... $ac_c" 1>&6 -echo "configure:5136: checking gtk version" >&5 +echo "configure:5160: checking gtk version" >&5 GTK_VERSION=`${GTK_CONFIG} --version` echo "$ac_t""${GTK_VERSION}" 1>&6 echo $ac_n "checking gtk libs""... $ac_c" 1>&6 -echo "configure:5141: checking gtk libs" >&5 +echo "configure:5165: checking gtk libs" >&5 GTK_LIBS=`${GTK_CONFIG} --libs` libs_gtk="$libs_gtk ${GTK_LIBS}" && if test "$extra_verbose" = "yes"; then echo " Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi echo "$ac_t""${GTK_LIBS}" 1>&6 echo $ac_n "checking gtk cflags""... $ac_c" 1>&6 -echo "configure:5147: checking gtk cflags" >&5 +echo "configure:5171: checking gtk cflags" >&5 GTK_CFLAGS=`${GTK_CONFIG} --cflags` if test "$GCC" = "yes"; then GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow" @@ -5153,19 +5177,19 @@ echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6 -echo "configure:5157: checking for main in -lgdk_imlib" >&5 +echo "configure:5181: checking for main in -lgdk_imlib" >&5 ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdk_imlib " cat > conftest.$ac_ext <<EOF -#line 5162 "configure" +#line 5186 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5193: \"$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 @@ -5187,12 +5211,12 @@ echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6 -echo "configure:5191: checking for Imlib_init in -lImlib" >&5 +echo "configure:5215: checking for Imlib_init in -lImlib" >&5 ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'` xe_check_libs=" -lImlib " cat > conftest.$ac_ext <<EOF -#line 5196 "configure" +#line 5220 "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 @@ -5203,7 +5227,7 @@ Imlib_init() ; return 0; } EOF -if { (eval echo configure:5207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5231: \"$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 @@ -5226,10 +5250,10 @@ for ac_func in gdk_imlib_init do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5230: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5233 "configure" +echo "configure:5254: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5257 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5252,7 +5276,7 @@ ; return 0; } EOF -if { (eval echo configure:5256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5280: \"$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 @@ -5318,15 +5342,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5322: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5325 "configure" +echo "configure:5346: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5349 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5354: \"$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* @@ -5357,19 +5381,19 @@ echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6 -echo "configure:5361: checking for main in -lxml" >&5 +echo "configure:5385: checking for main in -lxml" >&5 ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lxml " cat > conftest.$ac_ext <<EOF -#line 5366 "configure" +#line 5390 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5397: \"$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 @@ -5391,19 +5415,19 @@ echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6 -echo "configure:5395: checking for main in -lglade" >&5 +echo "configure:5419: checking for main in -lglade" >&5 ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lglade " cat > conftest.$ac_ext <<EOF -#line 5400 "configure" +#line 5424 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5431: \"$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 @@ -5425,19 +5449,19 @@ echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6 -echo "configure:5429: checking for main in -lglade-gnome" >&5 +echo "configure:5453: checking for main in -lglade-gnome" >&5 ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lglade-gnome " cat > conftest.$ac_ext <<EOF -#line 5434 "configure" +#line 5458 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5465: \"$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 @@ -5458,7 +5482,7 @@ cat > conftest.$ac_ext <<EOF -#line 5462 "configure" +#line 5486 "configure" #include "confdefs.h" #include <glade/glade-xml.h> EOF @@ -5517,7 +5541,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:5521: checking for X" >&5 +echo "configure:5545: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5577,12 +5601,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 5581 "configure" +#line 5605 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5610: \"$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* @@ -5651,14 +5675,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 5655 "configure" +#line 5679 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:5662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -5767,17 +5791,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:5771: checking whether -R must be followed by a space" >&5 +echo "configure:5795: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 5774 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:5781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +#line 5798 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:5805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -5793,14 +5817,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 5797 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:5804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +#line 5821 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:5828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -5836,12 +5860,12 @@ else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:5840: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:5864: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet " cat > conftest.$ac_ext <<EOF -#line 5845 "configure" +#line 5869 "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 @@ -5852,7 +5876,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:5856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5880: \"$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 @@ -5876,12 +5900,12 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:5880: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:5904: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet_stub " cat > conftest.$ac_ext <<EOF -#line 5885 "configure" +#line 5909 "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 @@ -5892,7 +5916,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:5896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5920: \"$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 @@ -5921,10 +5945,10 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:5925: checking for gethostbyname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5928 "configure" +echo "configure:5949: checking for gethostbyname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5952 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -5947,7 +5971,7 @@ ; return 0; } EOF -if { (eval echo configure:5951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -5968,12 +5992,12 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:5972: checking for gethostbyname in -lnsl" >&5 +echo "configure:5996: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` xe_check_libs=" -lnsl " cat > conftest.$ac_ext <<EOF -#line 5977 "configure" +#line 6001 "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 @@ -5984,7 +6008,7 @@ gethostbyname() ; return 0; } EOF -if { (eval echo configure:5988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6012: \"$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 @@ -6014,10 +6038,10 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:6018: checking for connect" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6021 "configure" +echo "configure:6042: checking for connect" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6045 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -6040,7 +6064,7 @@ ; return 0; } EOF -if { (eval echo configure:6044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -6063,12 +6087,12 @@ xe_msg_checking="for connect in -lsocket" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6067: checking "$xe_msg_checking"" >&5 +echo "configure:6091: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocket $X_EXTRA_LIBS" cat > conftest.$ac_ext <<EOF -#line 6072 "configure" +#line 6096 "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 @@ -6079,7 +6103,7 @@ connect() ; return 0; } EOF -if { (eval echo configure:6083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6107: \"$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 @@ -6103,10 +6127,10 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:6107: checking for remove" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6110 "configure" +echo "configure:6131: checking for remove" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6134 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -6129,7 +6153,7 @@ ; return 0; } EOF -if { (eval echo configure:6133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -6150,12 +6174,12 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:6154: checking for remove in -lposix" >&5 +echo "configure:6178: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` xe_check_libs=" -lposix " cat > conftest.$ac_ext <<EOF -#line 6159 "configure" +#line 6183 "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 @@ -6166,7 +6190,7 @@ remove() ; return 0; } EOF -if { (eval echo configure:6170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6194: \"$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 @@ -6190,10 +6214,10 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:6194: checking for shmat" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6197 "configure" +echo "configure:6218: checking for shmat" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6221 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -6216,7 +6240,7 @@ ; return 0; } EOF -if { (eval echo configure:6220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -6237,12 +6261,12 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:6241: checking for shmat in -lipc" >&5 +echo "configure:6265: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` xe_check_libs=" -lipc " cat > conftest.$ac_ext <<EOF -#line 6246 "configure" +#line 6270 "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 @@ -6253,7 +6277,7 @@ shmat() ; return 0; } EOF -if { (eval echo configure:6257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6281: \"$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 @@ -6289,12 +6313,12 @@ xe_msg_checking="for IceConnectionNumber in -lICE" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6293: checking "$xe_msg_checking"" >&5 +echo "configure:6317: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` xe_check_libs=" -lICE $X_EXTRA_LIBS" cat > conftest.$ac_ext <<EOF -#line 6298 "configure" +#line 6322 "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 @@ -6305,7 +6329,7 @@ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:6309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6333: \"$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 @@ -6472,7 +6496,7 @@ echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:6476: checking for X defines extracted by xmkmf" >&5 +echo "configure:6500: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir @@ -6521,15 +6545,15 @@ ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:6525: checking for X11/Intrinsic.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6528 "configure" +echo "configure:6549: checking for X11/Intrinsic.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6552 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6557: \"$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* @@ -6553,12 +6577,12 @@ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:6557: checking for XOpenDisplay in -lX11" >&5 +echo "configure:6581: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 6562 "configure" +#line 6586 "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 @@ -6569,7 +6593,7 @@ XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:6573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6597: \"$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 @@ -6594,12 +6618,12 @@ xe_msg_checking="for XGetFontProperty in -lX11" test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6598: checking "$xe_msg_checking"" >&5 +echo "configure:6622: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 -b i486-linuxaout" cat > conftest.$ac_ext <<EOF -#line 6603 "configure" +#line 6627 "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 @@ -6610,7 +6634,7 @@ XGetFontProperty() ; return 0; } EOF -if { (eval echo configure:6614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6638: \"$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 @@ -6637,12 +6661,12 @@ echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:6641: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:6665: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` xe_check_libs=" -lXext " cat > conftest.$ac_ext <<EOF -#line 6646 "configure" +#line 6670 "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 @@ -6653,7 +6677,7 @@ XShapeSelectInput() ; return 0; } EOF -if { (eval echo configure:6657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6681: \"$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 @@ -6676,12 +6700,12 @@ echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:6680: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:6704: checking for XtOpenDisplay in -lXt" >&5 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lXt " cat > conftest.$ac_ext <<EOF -#line 6685 "configure" +#line 6709 "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 @@ -6692,7 +6716,7 @@ XtOpenDisplay() ; return 0; } EOF -if { (eval echo configure:6696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6720: \"$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 @@ -6715,14 +6739,14 @@ echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:6719: checking the version of X11 being used" >&5 +echo "configure:6743: checking the version of X11 being used" >&5 cat > conftest.$ac_ext <<EOF -#line 6721 "configure" +#line 6745 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; } EOF -if { (eval echo configure:6726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:6750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest foobar; x11_release=$? else @@ -6753,10 +6777,10 @@ for ac_func in XConvertCase do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6757: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6760 "configure" +echo "configure:6781: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6784 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6779,7 +6803,7 @@ ; return 0; } EOF -if { (eval echo configure:6783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6807: \"$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 @@ -6811,15 +6835,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6815: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6818 "configure" +echo "configure:6839: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6842 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6847: \"$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* @@ -6852,10 +6876,10 @@ for ac_func in XRegisterIMInstantiateCallback do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6856: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6859 "configure" +echo "configure:6880: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6883 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6878,7 +6902,7 @@ ; return 0; } EOF -if { (eval echo configure:6882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6906: \"$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 @@ -6906,9 +6930,9 @@ done echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6 -echo "configure:6910: checking for standard XRegisterIMInstantiateCallback prototype" >&5 +echo "configure:6934: checking for standard XRegisterIMInstantiateCallback prototype" >&5 cat > conftest.$ac_ext <<EOF -#line 6912 "configure" +#line 6936 "configure" #include "confdefs.h" #define NeedFunctionPrototypes 1 @@ -6920,7 +6944,7 @@ ; return 0; } EOF -if { (eval echo configure:6924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -6941,12 +6965,12 @@ test -z "$with_xmu" && { echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6 -echo "configure:6945: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 +echo "configure:6969: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'` xe_check_libs=" -lXmu " cat > conftest.$ac_ext <<EOF -#line 6950 "configure" +#line 6974 "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 @@ -6957,7 +6981,7 @@ XmuReadBitmapDataFromFile() ; return 0; } EOF -if { (eval echo configure:6961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6985: \"$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 @@ -6996,19 +7020,19 @@ echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:7000: checking for main in -lXbsd" >&5 +echo "configure:7024: checking for main in -lXbsd" >&5 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lXbsd " cat > conftest.$ac_ext <<EOF -#line 7005 "configure" +#line 7029 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7036: \"$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 @@ -7045,22 +7069,22 @@ fi if test "$with_msw" != "no"; then echo "checking for MS-Windows" 1>&6 -echo "configure:7049: checking for MS-Windows" >&5 +echo "configure:7073: checking for MS-Windows" >&5 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:7052: checking for main in -lgdi32" >&5 +echo "configure:7076: checking for main in -lgdi32" >&5 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdi32 " cat > conftest.$ac_ext <<EOF -#line 7057 "configure" +#line 7081 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7088: \"$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 @@ -7111,12 +7135,12 @@ test "$with_widgets" != "no" && with_widgets=msw fi cat > conftest.$ac_ext <<EOF -#line 7115 "configure" +#line 7139 "configure" #include "confdefs.h" #include <fcntl.h> int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; } EOF -if { (eval echo configure:7120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MSG_SELECT @@ -7177,15 +7201,15 @@ if test "$with_x11" = "yes"; then ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6 -echo "configure:7181: checking for X11/extensions/shape.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7184 "configure" +echo "configure:7205: checking for X11/extensions/shape.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7208 "configure" #include "confdefs.h" #include <X11/extensions/shape.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7213: \"$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* @@ -7235,7 +7259,7 @@ esac echo "checking for WM_COMMAND option" 1>&6 -echo "configure:7239: checking for WM_COMMAND option" >&5; +echo "configure:7263: checking for WM_COMMAND option" >&5; if test "$with_wmcommand" != "no"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_WMCOMMAND @@ -7250,15 +7274,15 @@ test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6 -echo "configure:7254: checking for X11/Xauth.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7257 "configure" +echo "configure:7278: checking for X11/Xauth.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7281 "configure" #include "confdefs.h" #include <X11/Xauth.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7286: \"$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* @@ -7281,12 +7305,12 @@ } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:7285: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:7309: checking for XauGetAuthByAddr in -lXau" >&5 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'` xe_check_libs=" -lXau " cat > conftest.$ac_ext <<EOF -#line 7290 "configure" +#line 7314 "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 @@ -7297,7 +7321,7 @@ XauGetAuthByAddr() ; return 0; } EOF -if { (eval echo configure:7301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7325: \"$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 @@ -7342,15 +7366,15 @@ for dir in "" "Tt/" "desktop/" ; do ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6 -echo "configure:7346: checking for ${dir}tt_c.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7349 "configure" +echo "configure:7370: checking for ${dir}tt_c.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7373 "configure" #include "confdefs.h" #include <${dir}tt_c.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7378: \"$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* @@ -7386,12 +7410,12 @@ xe_msg_checking="for tt_message_create in -ltt" test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7390: checking "$xe_msg_checking"" >&5 +echo "configure:7414: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'` xe_check_libs=" -ltt $extra_libs" cat > conftest.$ac_ext <<EOF -#line 7395 "configure" +#line 7419 "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 @@ -7402,7 +7426,7 @@ tt_message_create() ; return 0; } EOF -if { (eval echo configure:7406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7430: \"$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 @@ -7456,15 +7480,15 @@ test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6 -echo "configure:7460: checking for Dt/Dt.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7463 "configure" +echo "configure:7484: checking for Dt/Dt.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7487 "configure" #include "confdefs.h" #include <Dt/Dt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7468: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7492: \"$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* @@ -7487,12 +7511,12 @@ } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:7491: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:7515: checking for DtDndDragStart in -lDtSvc" >&5 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lDtSvc " cat > conftest.$ac_ext <<EOF -#line 7496 "configure" +#line 7520 "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 @@ -7503,7 +7527,7 @@ DtDndDragStart() ; return 0; } EOF -if { (eval echo configure:7507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7531: \"$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 @@ -7584,7 +7608,7 @@ if test "$with_dragndrop" != "no" ; then echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6 -echo "configure:7588: checking if drag and drop API is needed" >&5 +echo "configure:7612: checking if drag and drop API is needed" >&5 if test -n "$dragndrop_proto" ; then with_dragndrop=yes echo "$ac_t""yes (${dragndrop_proto} )" 1>&6 @@ -7604,18 +7628,18 @@ fi echo "checking for LDAP" 1>&6 -echo "configure:7608: checking for LDAP" >&5 +echo "configure:7632: checking for LDAP" >&5 test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ldap.h""... $ac_c" 1>&6 -echo "configure:7611: checking for ldap.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7614 "configure" +echo "configure:7635: checking for ldap.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7638 "configure" #include "confdefs.h" #include <ldap.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7643: \"$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* @@ -7638,15 +7662,15 @@ } test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for lber.h""... $ac_c" 1>&6 -echo "configure:7642: checking for lber.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7645 "configure" +echo "configure:7666: checking for lber.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7669 "configure" #include "confdefs.h" #include <lber.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7674: \"$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* @@ -7670,12 +7694,12 @@ if test "$with_ldap" != "no"; then echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6 -echo "configure:7674: checking for ldap_search in -lldap" >&5 +echo "configure:7698: checking for ldap_search in -lldap" >&5 ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap " cat > conftest.$ac_ext <<EOF -#line 7679 "configure" +#line 7703 "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 @@ -7686,7 +7710,7 @@ ldap_search() ; return 0; } EOF -if { (eval echo configure:7690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7714: \"$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 @@ -7711,12 +7735,12 @@ xe_msg_checking="for ldap_open in -lldap" test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7715: checking "$xe_msg_checking"" >&5 +echo "configure:7739: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber" cat > conftest.$ac_ext <<EOF -#line 7720 "configure" +#line 7744 "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 @@ -7727,7 +7751,7 @@ ldap_open() ; return 0; } EOF -if { (eval echo configure:7731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7755: \"$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 @@ -7752,12 +7776,12 @@ xe_msg_checking="for ldap_open in -lldap" test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7756: checking "$xe_msg_checking"" >&5 +echo "configure:7780: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber -lkrb" cat > conftest.$ac_ext <<EOF -#line 7761 "configure" +#line 7785 "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 @@ -7768,7 +7792,7 @@ ldap_open() ; return 0; } EOF -if { (eval echo configure:7772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7796: \"$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 @@ -7793,12 +7817,12 @@ xe_msg_checking="for ldap_open in -lldap" test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7797: checking "$xe_msg_checking"" >&5 +echo "configure:7821: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber -lkrb -ldes" cat > conftest.$ac_ext <<EOF -#line 7802 "configure" +#line 7826 "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 @@ -7809,7 +7833,7 @@ ldap_open() ; return 0; } EOF -if { (eval echo configure:7813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7837: \"$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 @@ -7857,10 +7881,10 @@ for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7861: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7864 "configure" +echo "configure:7885: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7888 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7883,7 +7907,7 @@ ; return 0; } EOF -if { (eval echo configure:7887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7911: \"$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 @@ -7914,20 +7938,20 @@ if test "$with_postgresql" != "no"; then echo "checking for PostgreSQL" 1>&6 -echo "configure:7918: checking for PostgreSQL" >&5 +echo "configure:7942: checking for PostgreSQL" >&5 for header_dir in "" "pgsql/" "postgresql/"; do ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6 -echo "configure:7923: checking for ${header_dir}libpq-fe.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7926 "configure" +echo "configure:7947: checking for ${header_dir}libpq-fe.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7950 "configure" #include "confdefs.h" #include <${header_dir}libpq-fe.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7955: \"$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* @@ -7951,12 +7975,12 @@ test -n "$libpq_fe_h_file" && { echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6 -echo "configure:7955: checking for PQconnectdb in -lpq" >&5 +echo "configure:7979: checking for PQconnectdb in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <<EOF -#line 7960 "configure" +#line 7984 "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 @@ -7967,7 +7991,7 @@ PQconnectdb() ; return 0; } EOF -if { (eval echo configure:7971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7995: \"$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 @@ -8000,12 +8024,12 @@ echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6 -echo "configure:8004: checking for PQconnectStart in -lpq" >&5 +echo "configure:8028: checking for PQconnectStart in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <<EOF -#line 8009 "configure" +#line 8033 "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 @@ -8016,7 +8040,7 @@ PQconnectStart() ; return 0; } EOF -if { (eval echo configure:8020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8044: \"$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 @@ -8061,7 +8085,7 @@ if test "$window_system" != "none"; then echo "checking for graphics libraries" 1>&6 -echo "configure:8065: checking for graphics libraries" >&5 +echo "configure:8089: checking for graphics libraries" >&5 libpath_xpm= incpath_xpm= @@ -8087,10 +8111,10 @@ CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6 -echo "configure:8091: checking for Xpm - no older than 3.4f" >&5 +echo "configure:8115: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 8094 "configure" +#line 8118 "configure" #include "confdefs.h" #define XPM_NUMBERS #include <X11/xpm.h> @@ -8099,7 +8123,7 @@ XpmIncludeVersion != XpmLibraryVersion() ? 1 : XpmIncludeVersion < 30406 ? 2 : 0 ;} EOF -if { (eval echo configure:8103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:8127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; xpm_status=$?; if test "$xpm_status" = "0"; then @@ -8143,17 +8167,17 @@ libs_x="-lXpm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6 -echo "configure:8147: checking for \"FOR_MSW\" xpm" >&5 +echo "configure:8171: checking for \"FOR_MSW\" xpm" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 8150 "configure" +#line 8174 "configure" #include "confdefs.h" int main() { XpmCreatePixmapFromData() ; return 0; } EOF -if { (eval echo configure:8157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xpm_for_msw=no else @@ -8179,15 +8203,15 @@ test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:8183: checking for compface.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8186 "configure" +echo "configure:8207: checking for compface.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8210 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8215: \"$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* @@ -8210,12 +8234,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:8214: checking for UnGenFace in -lcompface" >&5 +echo "configure:8238: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <<EOF -#line 8219 "configure" +#line 8243 "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 @@ -8226,7 +8250,7 @@ UnGenFace() ; return 0; } EOF -if { (eval echo configure:8230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8254: \"$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 @@ -8275,12 +8299,12 @@ if test "$with_png $with_tiff" != "no no"; then echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6 -echo "configure:8279: checking for inflate in -lc" >&5 +echo "configure:8303: checking for inflate in -lc" >&5 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lc " cat > conftest.$ac_ext <<EOF -#line 8284 "configure" +#line 8308 "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 @@ -8291,7 +8315,7 @@ inflate() ; return 0; } EOF -if { (eval echo configure:8295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8319: \"$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 @@ -8310,12 +8334,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:8314: checking for inflate in -lz" >&5 +echo "configure:8338: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lz " cat > conftest.$ac_ext <<EOF -#line 8319 "configure" +#line 8343 "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 @@ -8326,7 +8350,7 @@ inflate() ; return 0; } EOF -if { (eval echo configure:8330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8354: \"$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 @@ -8345,12 +8369,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6 -echo "configure:8349: checking for inflate in -lgz" >&5 +echo "configure:8373: checking for inflate in -lgz" >&5 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lgz " cat > conftest.$ac_ext <<EOF -#line 8354 "configure" +#line 8378 "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 @@ -8361,7 +8385,7 @@ inflate() ; return 0; } EOF -if { (eval echo configure:8365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8389: \"$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 @@ -8391,15 +8415,15 @@ test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:8395: checking for jpeglib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8398 "configure" +echo "configure:8419: checking for jpeglib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8422 "configure" #include "confdefs.h" #include <jpeglib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8427: \"$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* @@ -8422,12 +8446,12 @@ } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:8426: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:8450: checking for jpeg_destroy_decompress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'` xe_check_libs=" -ljpeg " cat > conftest.$ac_ext <<EOF -#line 8431 "configure" +#line 8455 "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 @@ -8438,7 +8462,7 @@ jpeg_destroy_decompress() ; return 0; } EOF -if { (eval echo configure:8442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8466: \"$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 @@ -8474,10 +8498,10 @@ png_problem="" test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:8478: checking for pow" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8481 "configure" +echo "configure:8502: checking for pow" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8505 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pow(); below. */ @@ -8500,7 +8524,7 @@ ; return 0; } EOF -if { (eval echo configure:8504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pow=yes" else @@ -8521,15 +8545,15 @@ } test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:8525: checking for png.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8528 "configure" +echo "configure:8549: checking for png.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8552 "configure" #include "confdefs.h" #include <png.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8557: \"$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* @@ -8552,12 +8576,12 @@ } test -z "$with_png" && { echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:8556: checking for png_read_image in -lpng" >&5 +echo "configure:8580: checking for png_read_image in -lpng" >&5 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'` xe_check_libs=" -lpng " cat > conftest.$ac_ext <<EOF -#line 8561 "configure" +#line 8585 "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 @@ -8568,7 +8592,7 @@ png_read_image() ; return 0; } EOF -if { (eval echo configure:8572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8596: \"$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 @@ -8591,10 +8615,10 @@ } if test -z "$with_png"; then echo $ac_n "checking for workable png version information""... $ac_c" 1>&6 -echo "configure:8595: checking for workable png version information" >&5 +echo "configure:8619: checking for workable png version information" >&5 xe_check_libs="-lpng -lz" cat > conftest.$ac_ext <<EOF -#line 8598 "configure" +#line 8622 "configure" #include "confdefs.h" #include <png.h> int main(int c, char **v) { @@ -8602,7 +8626,7 @@ if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1; return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;} EOF -if { (eval echo configure:8606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:8630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; png_status=$?; if test "$png_status" = "0"; then @@ -8645,15 +8669,15 @@ test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:8649: checking for tiffio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8652 "configure" +echo "configure:8673: checking for tiffio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8676 "configure" #include "confdefs.h" #include <tiffio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8681: \"$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* @@ -8676,12 +8700,12 @@ } test -z "$with_tiff" && { echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:8680: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:8704: checking for TIFFClientOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'` xe_check_libs=" -ltiff " cat > conftest.$ac_ext <<EOF -#line 8685 "configure" +#line 8709 "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 @@ -8692,7 +8716,7 @@ TIFFClientOpen() ; return 0; } EOF -if { (eval echo configure:8696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8720: \"$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 @@ -8731,15 +8755,15 @@ if test "$with_gtk" = "yes"; then test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:8735: checking for compface.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8738 "configure" +echo "configure:8759: checking for compface.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8762 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8767: \"$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* @@ -8762,12 +8786,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:8766: checking for UnGenFace in -lcompface" >&5 +echo "configure:8790: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <<EOF -#line 8771 "configure" +#line 8795 "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 @@ -8778,7 +8802,7 @@ UnGenFace() ; return 0; } EOF -if { (eval echo configure:8782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8806: \"$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 @@ -8817,7 +8841,7 @@ if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:8821: checking for X11 graphics libraries" >&5 +echo "configure:8845: checking for X11 graphics libraries" >&5 fi case "$with_widgets" in @@ -8827,7 +8851,7 @@ if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then echo "checking for the Athena widgets" 1>&6 -echo "configure:8831: checking for the Athena widgets" >&5 +echo "configure:8855: checking for the Athena widgets" >&5 case "$with_athena" in "xaw" | "") athena_variant=Xaw athena_3d=no ;; @@ -8841,12 +8865,12 @@ if test "$athena_3d" = "no"; then echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:8845: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 +echo "configure:8869: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <<EOF -#line 8850 "configure" +#line 8874 "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 @@ -8857,7 +8881,7 @@ XawScrollbarSetThumb() ; return 0; } EOF -if { (eval echo configure:8861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8885: \"$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 @@ -8873,12 +8897,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:8877: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:8901: checking for threeDClassRec in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <<EOF -#line 8882 "configure" +#line 8906 "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 @@ -8889,7 +8913,7 @@ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:8893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8917: \"$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 @@ -8920,12 +8944,12 @@ else echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:8924: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:8948: checking for threeDClassRec in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <<EOF -#line 8929 "configure" +#line 8953 "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 @@ -8936,7 +8960,7 @@ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:8940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8964: \"$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 @@ -8954,12 +8978,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6 -echo "configure:8958: checking for threeDClassRec in -lXaw" >&5 +echo "configure:8982: checking for threeDClassRec in -lXaw" >&5 ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -lXaw " cat > conftest.$ac_ext <<EOF -#line 8963 "configure" +#line 8987 "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 @@ -8970,7 +8994,7 @@ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:8974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8998: \"$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 @@ -9001,15 +9025,15 @@ if test "$athena_3d" = "no"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9005: checking for X11/Xaw/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9008 "configure" +echo "configure:9029: checking for X11/Xaw/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9032 "configure" #include "confdefs.h" #include <X11/Xaw/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9037: \"$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* @@ -9029,15 +9053,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6 -echo "configure:9033: checking for X11/Xaw/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9036 "configure" +echo "configure:9057: checking for X11/Xaw/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9060 "configure" #include "confdefs.h" #include <X11/Xaw/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9065: \"$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* @@ -9063,15 +9087,15 @@ else ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:9067: checking for X11/$athena_variant/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9070 "configure" +echo "configure:9091: checking for X11/$athena_variant/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9094 "configure" #include "confdefs.h" #include <X11/$athena_variant/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9099: \"$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* @@ -9088,15 +9112,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9092: checking for X11/$athena_variant/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9095 "configure" +echo "configure:9116: checking for X11/$athena_variant/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9119 "configure" #include "confdefs.h" #include <X11/$athena_variant/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9124: \"$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* @@ -9124,15 +9148,15 @@ if test -z "$athena_h_path"; then ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:9128: checking for $athena_variant/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9131 "configure" +echo "configure:9152: checking for $athena_variant/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9155 "configure" #include "confdefs.h" #include <$athena_variant/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9160: \"$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* @@ -9149,15 +9173,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9153: checking for $athena_variant/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9156 "configure" +echo "configure:9177: checking for $athena_variant/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9180 "configure" #include "confdefs.h" #include <$athena_variant/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9185: \"$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* @@ -9186,15 +9210,15 @@ if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:9190: checking for X11/Xaw3d/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9193 "configure" +echo "configure:9214: checking for X11/Xaw3d/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9217 "configure" #include "confdefs.h" #include <X11/Xaw3d/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9222: \"$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* @@ -9211,15 +9235,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9215: checking for X11/Xaw3d/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9218 "configure" +echo "configure:9239: checking for X11/Xaw3d/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9242 "configure" #include "confdefs.h" #include <X11/Xaw3d/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9247: \"$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* @@ -9251,15 +9275,15 @@ if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:9255: checking for Xaw3d/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9258 "configure" +echo "configure:9279: checking for Xaw3d/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9282 "configure" #include "confdefs.h" #include <Xaw3d/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9287: \"$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* @@ -9276,15 +9300,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9280: checking for Xaw3d/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9283 "configure" +echo "configure:9304: checking for Xaw3d/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9307 "configure" #include "confdefs.h" #include <Xaw3d/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9312: \"$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* @@ -9316,15 +9340,15 @@ if test -z "$athena_h_path"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9320: checking for X11/Xaw/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9323 "configure" +echo "configure:9344: checking for X11/Xaw/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9347 "configure" #include "confdefs.h" #include <X11/Xaw/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9352: \"$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* @@ -9363,15 +9387,15 @@ if test "$with_x11" = "yes"; then ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:9367: checking for Xm/Xm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9370 "configure" +echo "configure:9391: checking for Xm/Xm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9394 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9399: \"$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* @@ -9388,12 +9412,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:9392: checking for XmStringFree in -lXm" >&5 +echo "configure:9416: checking for XmStringFree in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 9397 "configure" +#line 9421 "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 @@ -9404,7 +9428,7 @@ XmStringFree() ; return 0; } EOF -if { (eval echo configure:9408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9432: \"$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 @@ -9433,9 +9457,9 @@ if test "$have_motif" = "yes"; then echo $ac_n "checking for Lesstif""... $ac_c" 1>&6 -echo "configure:9437: checking for Lesstif" >&5 +echo "configure:9461: checking for Lesstif" >&5 cat > conftest.$ac_ext <<EOF -#line 9439 "configure" +#line 9463 "configure" #include "confdefs.h" #include <Xm/Xm.h> #ifdef LESSTIF_VERSION @@ -9808,7 +9832,7 @@ if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:9812: checking for Mule-related features" >&5 +echo "configure:9836: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -9822,15 +9846,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9826: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9829 "configure" +echo "configure:9850: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9853 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9858: \"$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* @@ -9861,12 +9885,12 @@ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:9865: checking for strerror in -lintl" >&5 +echo "configure:9889: checking for strerror in -lintl" >&5 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'` xe_check_libs=" -lintl " cat > conftest.$ac_ext <<EOF -#line 9870 "configure" +#line 9894 "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 @@ -9877,7 +9901,7 @@ strerror() ; return 0; } EOF -if { (eval echo configure:9881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9905: \"$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 @@ -9910,18 +9934,18 @@ echo "checking for Mule input methods" 1>&6 -echo "configure:9914: checking for Mule input methods" >&5 +echo "configure:9938: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:9917: checking for XIM" >&5 +echo "configure:9941: checking for XIM" >&5 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6 -echo "configure:9920: checking for XOpenIM in -lX11" >&5 +echo "configure:9944: checking for XOpenIM in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 9925 "configure" +#line 9949 "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 @@ -9932,7 +9956,7 @@ XOpenIM() ; return 0; } EOF -if { (eval echo configure:9936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9960: \"$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 @@ -9956,12 +9980,12 @@ if test "$have_motif $have_lesstif" = "yes no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:9960: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:9984: checking for XmImMbLookupString in -lXm" >&5 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 9965 "configure" +#line 9989 "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 @@ -9972,7 +9996,7 @@ XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:9976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10000: \"$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 @@ -10037,15 +10061,15 @@ if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:10041: checking for XFontSet" >&5 +echo "configure:10065: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:10044: checking for XmbDrawString in -lX11" >&5 +echo "configure:10068: checking for XmbDrawString in -lX11" >&5 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 10049 "configure" +#line 10073 "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 @@ -10056,7 +10080,7 @@ XmbDrawString() ; return 0; } EOF -if { (eval echo configure:10060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10084: \"$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 @@ -10096,15 +10120,15 @@ test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6 -echo "configure:10100: checking for wnn/jllib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10103 "configure" +echo "configure:10124: checking for wnn/jllib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10127 "configure" #include "confdefs.h" #include <wnn/jllib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10132: \"$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* @@ -10127,15 +10151,15 @@ } test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6 -echo "configure:10131: checking for wnn/commonhd.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10134 "configure" +echo "configure:10155: checking for wnn/commonhd.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10158 "configure" #include "confdefs.h" #include <wnn/commonhd.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10163: \"$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* @@ -10160,10 +10184,10 @@ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10164: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10167 "configure" +echo "configure:10188: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10191 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -10186,7 +10210,7 @@ ; return 0; } EOF -if { (eval echo configure:10190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10214: \"$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 @@ -10215,12 +10239,12 @@ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:10219: checking for crypt in -lcrypt" >&5 +echo "configure:10243: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` xe_check_libs=" -lcrypt " cat > conftest.$ac_ext <<EOF -#line 10224 "configure" +#line 10248 "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 @@ -10231,7 +10255,7 @@ crypt() ; return 0; } EOF -if { (eval echo configure:10235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10259: \"$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 @@ -10266,12 +10290,12 @@ if test -z "$with_wnn" -o "$with_wnn" = "yes"; then echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6 -echo "configure:10270: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:10294: checking for jl_dic_list_e in -lwnn" >&5 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn " cat > conftest.$ac_ext <<EOF -#line 10275 "configure" +#line 10299 "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 @@ -10282,7 +10306,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:10286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10310: \"$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 @@ -10300,12 +10324,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6 -echo "configure:10304: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:10328: checking for jl_dic_list_e in -lwnn4" >&5 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn4 " cat > conftest.$ac_ext <<EOF -#line 10309 "configure" +#line 10333 "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 @@ -10316,7 +10340,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:10320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10344: \"$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 @@ -10334,12 +10358,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6 -echo "configure:10338: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:10362: checking for jl_dic_list_e in -lwnn6" >&5 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6 " cat > conftest.$ac_ext <<EOF -#line 10343 "configure" +#line 10367 "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 @@ -10350,7 +10374,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:10354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10378: \"$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 @@ -10368,12 +10392,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6 -echo "configure:10372: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:10396: checking for dic_list_e in -lwnn6_fromsrc" >&5 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6_fromsrc " cat > conftest.$ac_ext <<EOF -#line 10377 "configure" +#line 10401 "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 @@ -10384,7 +10408,7 @@ dic_list_e() ; return 0; } EOF -if { (eval echo configure:10388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10412: \"$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 @@ -10429,12 +10453,12 @@ if test "$with_wnn6" != "no"; then echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6 -echo "configure:10433: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:10457: checking for jl_fi_dic_list in -l$libwnn" >&5 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'` xe_check_libs=" -l$libwnn " cat > conftest.$ac_ext <<EOF -#line 10438 "configure" +#line 10462 "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 @@ -10445,7 +10469,7 @@ jl_fi_dic_list() ; return 0; } EOF -if { (eval echo configure:10449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10473: \"$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 @@ -10480,15 +10504,15 @@ if test "$with_canna" != "no"; then ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:10484: checking for canna/jrkanji.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10487 "configure" +echo "configure:10508: checking for canna/jrkanji.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10511 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10516: \"$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* @@ -10515,15 +10539,15 @@ c_switch_site="$c_switch_site -I/usr/local/canna/include" ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:10519: checking for canna/jrkanji.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10522 "configure" +echo "configure:10543: checking for canna/jrkanji.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10546 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10551: \"$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* @@ -10551,15 +10575,15 @@ test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6 -echo "configure:10555: checking for canna/RK.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10558 "configure" +echo "configure:10579: checking for canna/RK.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10582 "configure" #include "confdefs.h" #include <canna/RK.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10587: \"$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* @@ -10582,12 +10606,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:10586: checking for RkBgnBun in -lRKC" >&5 +echo "configure:10610: checking for RkBgnBun in -lRKC" >&5 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'` xe_check_libs=" -lRKC " cat > conftest.$ac_ext <<EOF -#line 10591 "configure" +#line 10615 "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 @@ -10598,7 +10622,7 @@ RkBgnBun() ; return 0; } EOF -if { (eval echo configure:10602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10626: \"$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 @@ -10621,12 +10645,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:10625: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:10649: checking for jrKanjiControl in -lcanna" >&5 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'` xe_check_libs=" -lcanna " cat > conftest.$ac_ext <<EOF -#line 10630 "configure" +#line 10654 "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 @@ -10637,7 +10661,7 @@ jrKanjiControl() ; return 0; } EOF -if { (eval echo configure:10641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10665: \"$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 @@ -10683,12 +10707,12 @@ libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6 -echo "configure:10687: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:10711: checking for layout_object_getvalue in -li18n" >&5 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'` xe_check_libs=" -li18n " cat > conftest.$ac_ext <<EOF -#line 10692 "configure" +#line 10716 "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 @@ -10699,7 +10723,7 @@ layout_object_getvalue() ; return 0; } EOF -if { (eval echo configure:10703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10727: \"$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 @@ -10785,10 +10809,10 @@ for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror symlink tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10789: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10792 "configure" +echo "configure:10813: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10816 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -10811,7 +10835,7 @@ ; return 0; } EOF -if { (eval echo configure:10815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10839: \"$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 @@ -10843,10 +10867,10 @@ for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10847: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10850 "configure" +echo "configure:10871: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10874 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -10869,7 +10893,7 @@ ; return 0; } EOF -if { (eval echo configure:10873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10897: \"$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 @@ -10898,10 +10922,10 @@ echo $ac_n "checking for openpty""... $ac_c" 1>&6 -echo "configure:10902: checking for openpty" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10905 "configure" +echo "configure:10926: checking for openpty" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10929 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char openpty(); below. */ @@ -10924,7 +10948,7 @@ ; return 0; } EOF -if { (eval echo configure:10928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_openpty=yes" else @@ -10943,12 +10967,12 @@ echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:10947: checking for openpty in -lutil" >&5 +echo "configure:10971: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` xe_check_libs=" -lutil " cat > conftest.$ac_ext <<EOF -#line 10952 "configure" +#line 10976 "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 @@ -10959,7 +10983,7 @@ openpty() ; return 0; } EOF -if { (eval echo configure:10963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10987: \"$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 @@ -10994,15 +11018,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10998: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11001 "configure" +echo "configure:11022: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11025 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11030: \"$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* @@ -11039,15 +11063,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11043: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11046 "configure" +echo "configure:11067: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11070 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11075: \"$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* @@ -11080,15 +11104,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11084: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11087 "configure" +echo "configure:11108: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11111 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11116: \"$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* @@ -11121,15 +11145,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11125: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11128 "configure" +echo "configure:11149: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11152 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11157: \"$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* @@ -11165,15 +11189,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11169: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11172 "configure" +echo "configure:11193: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11196 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11201: \"$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* @@ -11206,10 +11230,10 @@ for ac_func in isastream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11210: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11213 "configure" +echo "configure:11234: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11237 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11232,7 +11256,7 @@ ; return 0; } EOF -if { (eval echo configure:11236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11260: \"$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 @@ -11263,15 +11287,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11267: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11270 "configure" +echo "configure:11291: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11294 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11299: \"$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* @@ -11304,10 +11328,10 @@ for ac_func in getloadavg do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11308: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11311 "configure" +echo "configure:11332: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11335 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11330,7 +11354,7 @@ ; return 0; } EOF -if { (eval echo configure:11334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11358: \"$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 @@ -11363,15 +11387,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11367: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11370 "configure" +echo "configure:11391: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11394 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11399: \"$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* @@ -11407,12 +11431,12 @@ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:11411: checking for kstat_open in -lkstat" >&5 +echo "configure:11435: checking for kstat_open in -lkstat" >&5 ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lkstat " cat > conftest.$ac_ext <<EOF -#line 11416 "configure" +#line 11440 "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 @@ -11423,7 +11447,7 @@ kstat_open() ; return 0; } EOF -if { (eval echo configure:11427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11451: \"$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 @@ -11458,15 +11482,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11462: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11465 "configure" +echo "configure:11486: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11489 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11494: \"$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* @@ -11498,12 +11522,12 @@ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:11502: checking for kvm_read in -lkvm" >&5 +echo "configure:11526: checking for kvm_read in -lkvm" >&5 ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'` xe_check_libs=" -lkvm " cat > conftest.$ac_ext <<EOF -#line 11507 "configure" +#line 11531 "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 @@ -11514,7 +11538,7 @@ kvm_read() ; return 0; } EOF -if { (eval echo configure:11518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11542: \"$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 @@ -11548,16 +11572,16 @@ fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:11552: checking whether netdb declares h_errno" >&5 -cat > conftest.$ac_ext <<EOF -#line 11554 "configure" +echo "configure:11576: checking whether netdb declares h_errno" >&5 +cat > conftest.$ac_ext <<EOF +#line 11578 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:11561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF @@ -11577,16 +11601,16 @@ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:11581: checking for sigsetjmp" >&5 -cat > conftest.$ac_ext <<EOF -#line 11583 "configure" +echo "configure:11605: checking for sigsetjmp" >&5 +cat > conftest.$ac_ext <<EOF +#line 11607 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:11590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF @@ -11606,11 +11630,11 @@ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:11610: checking whether localtime caches TZ" >&5 +echo "configure:11634: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 11614 "configure" +#line 11638 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS @@ -11645,7 +11669,7 @@ exit (0); } EOF -if { (eval echo configure:11649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:11673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else @@ -11675,9 +11699,9 @@ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:11679: checking whether gettimeofday accepts one or two arguments" >&5 -cat > conftest.$ac_ext <<EOF -#line 11681 "configure" +echo "configure:11703: checking whether gettimeofday accepts one or two arguments" >&5 +cat > conftest.$ac_ext <<EOF +#line 11705 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME @@ -11698,7 +11722,7 @@ ; return 0; } EOF -if { (eval echo configure:11702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""two" 1>&6 else @@ -11720,19 +11744,19 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:11724: checking for inline" >&5 +echo "configure:11748: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 11729 "configure" +#line 11753 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:11736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -11773,17 +11797,17 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:11777: checking for working alloca.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11780 "configure" +echo "configure:11801: checking for working alloca.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11804 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:11787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -11807,10 +11831,10 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:11811: checking for alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11814 "configure" +echo "configure:11835: checking for alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11838 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -11838,7 +11862,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:11842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -11877,10 +11901,10 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:11881: checking whether alloca needs Cray hooks" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11884 "configure" +echo "configure:11905: checking whether alloca needs Cray hooks" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11908 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -11904,10 +11928,10 @@ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11908: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11911 "configure" +echo "configure:11932: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11935 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11930,7 +11954,7 @@ ; return 0; } EOF -if { (eval echo configure:11934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11958: \"$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 @@ -11960,10 +11984,10 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:11964: checking stack direction for C alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11967 "configure" +echo "configure:11988: checking stack direction for C alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11991 "configure" #include "confdefs.h" find_stack_direction () { @@ -11982,7 +12006,7 @@ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:11986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else @@ -12011,10 +12035,10 @@ fi echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:12015: checking for working strcoll" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12018 "configure" +echo "configure:12039: checking for working strcoll" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12042 "configure" #include "confdefs.h" #include <string.h> main () @@ -12024,7 +12048,7 @@ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:12028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -12052,10 +12076,10 @@ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12056: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12059 "configure" +echo "configure:12080: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12083 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12078,7 +12102,7 @@ ; return 0; } EOF -if { (eval echo configure:12082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12106: \"$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 @@ -12106,10 +12130,10 @@ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:12110: checking whether getpgrp takes no argument" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12113 "configure" +echo "configure:12134: checking whether getpgrp takes no argument" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12137 "configure" #include "confdefs.h" /* @@ -12164,7 +12188,7 @@ } EOF -if { (eval echo configure:12168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -12191,10 +12215,10 @@ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:12195: checking for working mmap" >&5 +echo "configure:12219: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext <<EOF -#line 12198 "configure" +#line 12222 "configure" #include "confdefs.h" #include <stdio.h> #include <unistd.h> @@ -12227,7 +12251,7 @@ return 1; } EOF -if { (eval echo configure:12231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else @@ -12256,9 +12280,9 @@ if test "$rel_alloc $have_mmap" = "default yes"; then if test "$doug_lea_malloc" = "yes"; then echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6 -echo "configure:12260: checking for M_MMAP_THRESHOLD" >&5 +echo "configure:12284: checking for M_MMAP_THRESHOLD" >&5 cat > conftest.$ac_ext <<EOF -#line 12262 "configure" +#line 12286 "configure" #include "confdefs.h" #include <malloc.h> int main() { @@ -12270,7 +12294,7 @@ ; return 0; } EOF -if { (eval echo configure:12274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rel_alloc=no; echo "$ac_t""yes" 1>&6; else @@ -12295,15 +12319,15 @@ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:12299: checking for termios.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12302 "configure" +echo "configure:12323: checking for termios.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12326 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12331: \"$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* @@ -12346,15 +12370,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termio.h""... $ac_c" 1>&6 -echo "configure:12350: checking for termio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12353 "configure" +echo "configure:12374: checking for termio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12377 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12382: \"$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* @@ -12386,10 +12410,10 @@ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:12390: checking for socket" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12393 "configure" +echo "configure:12414: checking for socket" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12417 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ @@ -12412,7 +12436,7 @@ ; return 0; } EOF -if { (eval echo configure:12416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -12427,15 +12451,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6 -echo "configure:12431: checking for netinet/in.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12434 "configure" +echo "configure:12455: checking for netinet/in.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12458 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12463: \"$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* @@ -12452,15 +12476,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6 -echo "configure:12456: checking for arpa/inet.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12459 "configure" +echo "configure:12480: checking for arpa/inet.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12483 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12488: \"$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* @@ -12485,9 +12509,9 @@ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:12489: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:12513: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 12491 "configure" +#line 12515 "configure" #include "confdefs.h" #include <sys/types.h> @@ -12498,7 +12522,7 @@ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:12502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_SOCKADDR_SUN_LEN @@ -12516,9 +12540,9 @@ fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:12520: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:12544: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext <<EOF -#line 12522 "configure" +#line 12546 "configure" #include "confdefs.h" #include <sys/types.h> @@ -12528,7 +12552,7 @@ static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:12532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MULTICAST @@ -12559,10 +12583,10 @@ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:12563: checking for msgget" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12566 "configure" +echo "configure:12587: checking for msgget" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12590 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ @@ -12585,7 +12609,7 @@ ; return 0; } EOF -if { (eval echo configure:12589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_msgget=yes" else @@ -12600,15 +12624,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:12604: checking for sys/ipc.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12607 "configure" +echo "configure:12628: checking for sys/ipc.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12631 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12636: \"$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* @@ -12625,15 +12649,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -echo "configure:12629: checking for sys/msg.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12632 "configure" +echo "configure:12653: checking for sys/msg.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12656 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12661: \"$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* @@ -12671,15 +12695,15 @@ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:12675: checking for dirent.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12678 "configure" +echo "configure:12699: checking for dirent.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12702 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12707: \"$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* @@ -12706,15 +12730,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6 -echo "configure:12710: checking for sys/dir.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12713 "configure" +echo "configure:12734: checking for sys/dir.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12737 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12742: \"$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* @@ -12747,15 +12771,15 @@ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:12751: checking for nlist.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12754 "configure" +echo "configure:12775: checking for nlist.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12778 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12783: \"$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* @@ -12785,22 +12809,22 @@ echo "checking "for sound support"" 1>&6 -echo "configure:12789: checking "for sound support"" >&5 +echo "configure:12813: checking "for sound support"" >&5 test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes if test "$with_native_sound" != "no"; then if test -n "$native_sound_lib"; then ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6 -echo "configure:12796: checking for multimedia/audio_device.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12799 "configure" +echo "configure:12820: checking for multimedia/audio_device.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12823 "configure" #include "confdefs.h" #include <multimedia/audio_device.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12828: \"$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* @@ -12848,12 +12872,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:12852: checking for ALopenport in -laudio" >&5 +echo "configure:12876: checking for ALopenport in -laudio" >&5 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <<EOF -#line 12857 "configure" +#line 12881 "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 @@ -12864,7 +12888,7 @@ ALopenport() ; return 0; } EOF -if { (eval echo configure:12868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12892: \"$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 @@ -12895,12 +12919,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:12899: checking for AOpenAudio in -lAlib" >&5 +echo "configure:12923: checking for AOpenAudio in -lAlib" >&5 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'` xe_check_libs=" -lAlib " cat > conftest.$ac_ext <<EOF -#line 12904 "configure" +#line 12928 "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 @@ -12911,7 +12935,7 @@ AOpenAudio() ; return 0; } EOF -if { (eval echo configure:12915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12939: \"$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 @@ -12959,15 +12983,15 @@ for dir in "machine" "sys" "linux"; do ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6 -echo "configure:12963: checking for ${dir}/soundcard.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12966 "configure" +echo "configure:12987: checking for ${dir}/soundcard.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12990 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12995: \"$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* @@ -13021,15 +13045,15 @@ if test "$with_nas_sound" != "no"; then ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6 -echo "configure:13025: checking for audio/audiolib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13028 "configure" +echo "configure:13049: checking for audio/audiolib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13052 "configure" #include "confdefs.h" #include <audio/audiolib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13057: \"$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* @@ -13047,12 +13071,12 @@ echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6 -echo "configure:13051: checking for AuOpenServer in -laudio" >&5 +echo "configure:13075: checking for AuOpenServer in -laudio" >&5 ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <<EOF -#line 13056 "configure" +#line 13080 "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 @@ -13063,7 +13087,7 @@ AuOpenServer() ; return 0; } EOF -if { (eval echo configure:13067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13091: \"$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 @@ -13102,7 +13126,7 @@ fi libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi cat > conftest.$ac_ext <<EOF -#line 13106 "configure" +#line 13130 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF @@ -13133,7 +13157,7 @@ # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13137: checking for $ac_word" >&5 +echo "configure:13161: checking for $ac_word" >&5 if test -n "$have_esd_config"; then ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test. @@ -13162,10 +13186,10 @@ c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$extra_verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi LIBS="`esd-config --libs` $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6 -echo "configure:13166: checking for esd_play_stream" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13169 "configure" +echo "configure:13190: checking for esd_play_stream" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13193 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char esd_play_stream(); below. */ @@ -13188,7 +13212,7 @@ ; return 0; } EOF -if { (eval echo configure:13192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_esd_play_stream=yes" else @@ -13239,7 +13263,7 @@ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:13243: checking for TTY-related features" >&5 +echo "configure:13267: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -13252,12 +13276,12 @@ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:13256: checking for tgetent in -lncurses" >&5 +echo "configure:13280: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lncurses " cat > conftest.$ac_ext <<EOF -#line 13261 "configure" +#line 13285 "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 @@ -13268,7 +13292,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:13272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13296: \"$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 @@ -13301,15 +13325,15 @@ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:13305: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13308 "configure" +echo "configure:13329: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13332 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13337: \"$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* @@ -13331,15 +13355,15 @@ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:13335: checking for ncurses/term.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13338 "configure" +echo "configure:13359: checking for ncurses/term.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13362 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13367: \"$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* @@ -13369,15 +13393,15 @@ c_switch_site="$c_switch_site -I/usr/include/ncurses" ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:13373: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13376 "configure" +echo "configure:13397: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13400 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13405: \"$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* @@ -13412,12 +13436,12 @@ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:13416: checking for tgetent in -l$lib" >&5 +echo "configure:13440: checking for tgetent in -l$lib" >&5 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -l$lib " cat > conftest.$ac_ext <<EOF -#line 13421 "configure" +#line 13445 "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 @@ -13428,7 +13452,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:13432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13456: \"$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 @@ -13459,12 +13483,12 @@ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:13463: checking for tgetent in -lcurses" >&5 +echo "configure:13487: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lcurses " cat > conftest.$ac_ext <<EOF -#line 13468 "configure" +#line 13492 "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 @@ -13475,7 +13499,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:13479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13503: \"$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 @@ -13493,12 +13517,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:13497: checking for tgetent in -ltermcap" >&5 +echo "configure:13521: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -ltermcap " cat > conftest.$ac_ext <<EOF -#line 13502 "configure" +#line 13526 "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 @@ -13509,7 +13533,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:13513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13537: \"$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 @@ -13557,15 +13581,15 @@ test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gpm.h""... $ac_c" 1>&6 -echo "configure:13561: checking for gpm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13564 "configure" +echo "configure:13585: checking for gpm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13588 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13593: \"$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* @@ -13588,12 +13612,12 @@ } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:13592: checking for Gpm_Open in -lgpm" >&5 +echo "configure:13616: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgpm " cat > conftest.$ac_ext <<EOF -#line 13597 "configure" +#line 13621 "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 @@ -13604,7 +13628,7 @@ Gpm_Open() ; return 0; } EOF -if { (eval echo configure:13608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13632: \"$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 @@ -13647,20 +13671,20 @@ test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ != "no no no" && echo "checking for database support" 1>&6 -echo "configure:13651: checking for database support" >&5 +echo "configure:13675: checking for database support" >&5 if test "$with_database_gdbm $with_database_dbm" != "no no"; then ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6 -echo "configure:13656: checking for ndbm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13659 "configure" +echo "configure:13680: checking for ndbm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13683 "configure" #include "confdefs.h" #include <ndbm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13688: \"$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* @@ -13690,12 +13714,12 @@ if test "$with_database_gdbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:13694: checking for dbm_open in -lgdbm" >&5 +echo "configure:13718: checking for dbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdbm " cat > conftest.$ac_ext <<EOF -#line 13699 "configure" +#line 13723 "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 @@ -13706,7 +13730,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:13710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13734: \"$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 @@ -13734,10 +13758,10 @@ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:13738: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13741 "configure" +echo "configure:13762: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13765 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -13760,7 +13784,7 @@ ; return 0; } EOF -if { (eval echo configure:13764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -13779,12 +13803,12 @@ echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:13783: checking for dbm_open in -ldbm" >&5 +echo "configure:13807: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -ldbm " cat > conftest.$ac_ext <<EOF -#line 13788 "configure" +#line 13812 "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 @@ -13795,7 +13819,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:13799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13823: \"$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 @@ -13836,10 +13860,10 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:13840: checking for Berkeley db.h" >&5 +echo "configure:13864: checking for Berkeley db.h" >&5 for header in "db/db.h" "db.h"; do cat > conftest.$ac_ext <<EOF -#line 13843 "configure" +#line 13867 "configure" #include "confdefs.h" #include <stdlib.h> @@ -13861,7 +13885,7 @@ ; return 0; } EOF -if { (eval echo configure:13865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else @@ -13877,9 +13901,9 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:13881: checking for Berkeley DB version" >&5 +echo "configure:13905: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext <<EOF -#line 13883 "configure" +#line 13907 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 1 @@ -13891,7 +13915,7 @@ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 13895 "configure" +#line 13919 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 2 @@ -13918,10 +13942,10 @@ rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:13922: checking for $dbfunc" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13925 "configure" +echo "configure:13946: checking for $dbfunc" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13949 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $dbfunc(); below. */ @@ -13944,7 +13968,7 @@ ; return 0; } EOF -if { (eval echo configure:13948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13972: \"$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 @@ -13963,12 +13987,12 @@ echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:13967: checking for $dbfunc in -ldb" >&5 +echo "configure:13991: 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 13972 "configure" +#line 13996 "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 @@ -13979,7 +14003,7 @@ $dbfunc() ; return 0; } EOF -if { (eval echo configure:13983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14007: \"$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 @@ -14040,12 +14064,12 @@ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:14044: checking for SOCKSinit in -lsocks" >&5 +echo "configure:14068: 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 14049 "configure" +#line 14073 "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 @@ -14056,7 +14080,7 @@ SOCKSinit() ; return 0; } EOF -if { (eval echo configure:14060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14084: \"$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 @@ -14111,22 +14135,22 @@ if test "$with_modules" != "no"; then echo "checking for module support" 1>&6 -echo "configure:14115: checking for module support" >&5 +echo "configure:14139: checking for module support" >&5 if test "$with_msw" = "yes"; then have_dl=yes; else ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:14122: checking for dlfcn.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14125 "configure" +echo "configure:14146: checking for dlfcn.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14149 "configure" #include "confdefs.h" #include <dlfcn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14154: \"$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* @@ -14143,16 +14167,16 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:14147: checking for dlopen in -lc" >&5 +echo "configure:14171: checking for dlopen in -lc" >&5 cat > conftest.$ac_ext <<EOF -#line 14149 "configure" +#line 14173 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:14156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -14161,18 +14185,18 @@ rm -rf conftest* echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:14165: checking for dlopen in -ldl" >&5 +echo "configure:14189: checking for dlopen in -ldl" >&5 ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 14169 "configure" +#line 14193 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:14176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -14201,12 +14225,12 @@ else echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:14205: checking for shl_load in -ldld" >&5 +echo "configure:14229: 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 14210 "configure" +#line 14234 "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 @@ -14217,7 +14241,7 @@ shl_load() ; return 0; } EOF -if { (eval echo configure:14221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14245: \"$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 @@ -14244,12 +14268,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:14248: checking for dld_init in -ldld" >&5 +echo "configure:14272: 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 14253 "configure" +#line 14277 "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 @@ -14260,7 +14284,7 @@ dld_init() ; return 0; } EOF -if { (eval echo configure:14264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14288: \"$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 @@ -14305,7 +14329,7 @@ xealias=$internal_configuration echo "checking how to build dynamic libraries for ${xehost}" 1>&6 -echo "configure:14309: checking how to build dynamic libraries for ${xehost}" >&5 +echo "configure:14333: checking how to build dynamic libraries for ${xehost}" >&5 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; @@ -14333,9 +14357,9 @@ XEGCC=yes else echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:14337: checking checking whether we are using GNU C" >&5 +echo "configure:14361: checking checking whether we are using GNU C" >&5 cat > conftest.$ac_ext <<EOF -#line 14339 "configure" +#line 14363 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -14357,7 +14381,7 @@ fi echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6 -echo "configure:14361: checking how to produce PIC code" >&5 +echo "configure:14385: checking how to produce PIC code" >&5 wl= can_build_shared=yes @@ -14458,18 +14482,18 @@ # 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:14462: checking if PIC flag ${dll_cflags} really works" >&5 +echo "configure:14486: checking if PIC flag ${dll_cflags} really works" >&5 save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $dll_cflags -DPIC" cat > conftest.$ac_ext <<EOF -#line 14466 "configure" +#line 14490 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:14473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14497: \"$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 @@ -14500,7 +14524,7 @@ xldf= xcldf= echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6 -echo "configure:14504: checking if C compiler can produce shared libraries" >&5 +echo "configure:14528: checking if C compiler can produce shared libraries" >&5 if test "$XEGCC" = yes; then xcldf="-shared" xldf="-shared" @@ -14551,14 +14575,14 @@ 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 14555 "configure" +#line 14579 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:14562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cc_produces_so=yes else @@ -14583,7 +14607,7 @@ 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:14587: checking for ld used by GCC" >&5 +echo "configure:14611: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -14609,7 +14633,7 @@ esac else echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:14613: checking for GNU ld" >&5 +echo "configure:14637: checking for GNU ld" >&5 fi if test -z "$LTLD"; then @@ -14647,7 +14671,7 @@ # 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:14651: checking if the linker is GNU ld" >&5 +echo "configure:14675: 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 @@ -14675,7 +14699,7 @@ # 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:14679: checking whether the linker supports shared libraries" >&5 +echo "configure:14703: checking whether the linker supports shared libraries" >&5 dll_ld=$CC dll_ldflags=$LDFLAGS ld_shlibs=yes @@ -14883,10 +14907,10 @@ for ac_func in dlerror _dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14887: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14890 "configure" +echo "configure:14911: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14914 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -14909,7 +14933,7 @@ ; return 0; } EOF -if { (eval echo configure:14913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14937: \"$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 @@ -14948,11 +14972,11 @@ fi cat > conftest.$ac_ext <<EOF -#line 14952 "configure" +#line 14976 "configure" #include "confdefs.h" int main(int c,char *v[]){return 0;} EOF -if { (eval echo configure:14956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:14980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -15724,7 +15748,7 @@ test "$pdump" = yes && echo " Using the new portable dumper." test "$debug" = yes && echo " Compiling in support for extra debugging code." test "$usage_tracking" = yes && echo " Compiling in support for active usage tracking (Sun internal)." -if test "$error_check_extents $error_check_typecheck $error_check_charbpos $error_check_gc $error_check_malloc $error_check_glyphs" \ +if test "$error_check_extents $error_check_types $error_check_text $error_check_gc $error_check_malloc $error_check_glyphs $error_check_byte_code $error_check_display $error_check_structures" \ != "no no no no no no"; then echo " WARNING: ---------------------------------------------------------" echo " WARNING: Compiling in support for runtime error checking."
--- a/configure.in Sat Mar 30 04:46:48 2002 +0000 +++ b/configure.in Sun Mar 31 08:30:17 2002 +0000 @@ -691,11 +691,11 @@ extents ) error_check_extents=yes ;; noextents ) error_check_extents=no ;; - typecheck ) error_check_typecheck=yes ;; - notypecheck ) error_check_typecheck=no ;; - - charbpos ) error_check_charbpos=yes ;; - nocharbpos ) error_check_charbpos=no ;; + types ) error_check_types=yes ;; + notypes ) error_check_types=no ;; + + text ) error_check_text=yes ;; + notext ) error_check_text=no ;; gc ) error_check_gc=yes ;; nogc ) error_check_gc=no ;; @@ -706,28 +706,36 @@ byte_code ) error_check_byte_code=yes ;; nobyte_code ) error_check_byte_code=no ;; - glyphs ) error_check_glyphs=yes ;; - noglyphs ) error_check_glyphs=no ;; + glyphs ) error_check_glyphs=yes ;; + noglyphs ) error_check_glyphs=no ;; + + display ) error_check_display=yes ;; + nodisplay ) error_check_display=no ;; + + structures ) error_check_structures=yes ;; + nostructures ) error_check_structures=no ;; * ) bogus_error_check=yes ;; esac if test "$bogus_error_check" -o \ \( -n "$new_default" -a -n "$echeck_notfirst" \) ; then if test "$error_check_default" = yes ; then - types="\`all' (default), \`none', \`noextents', \`notypecheck', \`nocharbpos', \`nogc', \`nomalloc', \`noglyphs' and \`nobyte-code'." + types="\`all' (default), \`none', \`noextents', \`notypes', \`notext', \`nogc', \`nomalloc', \`noglyphs', \`nobyte-code', \`nodisplay', \`nostructures'." else - types="\`all', \`none' (default), \`extents', \`typecheck', \`charbpos', \`gc', \`malloc', \`glyphs' and \`byte-code'." + types="\`all', \`none' (default), \`extents', \`types', \`text', \`gc', \`malloc', \`glyphs', \`byte-code', \`display', \`structures'." fi USAGE_ERROR(["Valid types for the \`--$optname' option are: $types."]) elif test -n "$new_default" ; then error_check_extents=$new_default - error_check_typecheck=$new_default - error_check_charbpos=$new_default + error_check_types=$new_default + error_check_text=$new_default error_check_gc=$new_default error_check_malloc=$new_default error_check_byte_code=$new_default error_check_glyphs=$new_default + error_check_display=$new_default + error_check_structures=$new_default new_default= # reset this fi echeck_notfirst=true @@ -1016,13 +1024,15 @@ dnl Error checking default to "yes" in beta versions, to "no" in releases. dnl Same goes for --debug and --extra-verbosity. if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi -test "${error_check_extents=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS) -test "${error_check_typecheck=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPECHECK) -test "${error_check_charbpos=$beta}" = yes && AC_DEFINE(ERROR_CHECK_CHARBPOS) -test "${error_check_gc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC) -test "${error_check_malloc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC) -test "${error_check_byte_code=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE) -test "${error_check_glyphs=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GLYPHS) +test "${error_check_extents=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS) +test "${error_check_types=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPES) +test "${error_check_text=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TEXT) +test "${error_check_gc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC) +test "${error_check_malloc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC) +test "${error_check_byte_code=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE) +test "${error_check_glyphs=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GLYPHS) +test "${error_check_display=$beta}" = yes && AC_DEFINE(ERROR_CHECK_DISPLAY) +test "${error_check_structures=$beta}" = yes && AC_DEFINE(ERROR_CHECK_STRUCTURES) dnl debug=yes must be set when error checking is present. This should be dnl fixed up. dnl debug implies other options @@ -5008,7 +5018,7 @@ test "$pdump" = yes && echo " Using the new portable dumper." test "$debug" = yes && echo " Compiling in support for extra debugging code." test "$usage_tracking" = yes && echo " Compiling in support for active usage tracking (Sun internal)." -if test "$error_check_extents $error_check_typecheck $error_check_charbpos $error_check_gc $error_check_malloc $error_check_glyphs" \ +if test "$error_check_extents $error_check_types $error_check_text $error_check_gc $error_check_malloc $error_check_glyphs $error_check_byte_code $error_check_display $error_check_structures" \ != "no no no no no no"; then echo " WARNING: ---------------------------------------------------------" echo " WARNING: Compiling in support for runtime error checking."
--- a/lib-src/ChangeLog Sat Mar 30 04:46:48 2002 +0000 +++ b/lib-src/ChangeLog Sun Mar 31 08:30:17 2002 +0000 @@ -1,3 +1,8 @@ +2002-03-31 Ben Wing <ben@xemacs.org> + + * make-mswin-unicode.pl: Don't be fucked up by CRLF. Output code + to force errors when nonintercepted Windows calls issued. + 2002-03-14 Jonathan Harris <jhar@tardis.ed.ac.uk> * make-mswin-unicode.pl: Pick up location of include files from
--- a/lib-src/make-mswin-unicode.pl Sat Mar 30 04:46:48 2002 +0000 +++ b/lib-src/make-mswin-unicode.pl Sun Mar 31 08:30:17 2002 +0000 @@ -47,6 +47,9 @@ evil marketing decisions made by Microsoft. See src/intl-win32.c for more information. +In XEmacs, this file is normally run using `nmake -f xemacs.mak +unicode-encapsulate'. + This script processes the specified files, looking for commands indicating library routines to Unicode-encapsulate, as follows: @@ -139,6 +142,10 @@ while (<>) { chomp; + # remove trailing CR. #### Should not be necessary! Perl should be + # opening these in text mode by default, as the docs claim, and + # automatically remove the CR's. + tr/\r//d; if (/^begin-unicode-encapsulation-script$/) { @@ -324,6 +331,10 @@ $rettype =~ s/\bLPWSTR\b/Extbyte */; $rettype =~ s/\bLPCWSTR\b/const Extbyte */; } + print HOUT "#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED\n"; + print HOUT "#undef $fun\n"; + print HOUT "#define $fun error use qxe$fun or ${fun}A/${fun}W\n"; + print HOUT "#endif\n"; if (defined ($reason)) { print COUT "/* NOTE: $reason */\n"; @@ -385,6 +396,7 @@ print HOUT "#endif /* $bracket */\n"; print COUT "#endif /* $bracket */\n\n"; } + print HOUT "\n"; } } }
--- a/lisp/ChangeLog Sat Mar 30 04:46:48 2002 +0000 +++ b/lisp/ChangeLog Sun Mar 31 08:30:17 2002 +0000 @@ -1,3 +1,42 @@ +2002-03-31 Ben Wing <ben@xemacs.org> + + * behavior.el: + * behavior.el (within-behavior-enabling-disabling): New. + * behavior.el (behaviors): New. + * behavior.el (enabled-behavior-list): New. + * behavior.el (define-behavior): + * behavior.el (behavior-enabled-p): + * behavior.el (enable-behavior): + * behavior.el (disable-behavior): + * dumped-lisp.el (preloaded-file-list): + * menubar-items.el (default-menubar): + Add support for saving using custom. Load into a dumped XEmacs. + Correct :title to :short-doc in accordance with behavior-defs.el. + Add a submenu under Options for turning on/off behaviors. + + * cl-macs.el: + * cl-macs.el (loop): + * cl-macs.el (cl-parse-loop-clause): + Properly document `loop'. Fix a minor bug in keymap iteration and + add support for bit-vector iteration. + + * lisp-mode.el (construct-lisp-mode-menu): + Rearrange and add items for macro expanding. + + * menubar-items.el (menu-split-long-menu): + * menubar-items.el (menu-sort-menu): + Document connection between these two functions. + + * window.el: + * window.el (get-window-with-predicate): New. + * window.el (ALL-FRAMES): New. + * window.el ('some-window): New. + * window.el (count-windows): + * window.el (window-safely-shrinkable-p): New. + * window.el (count-screen-lines): New. + * window.el (shrink-window-if-larger-than-buffer): + Port stuff from GNU 21.1. + 2002-03-24 Ben Wing <ben@xemacs.org> * mule/english.el (ascii-right-to-left):
--- a/lisp/behavior.el Sat Mar 30 04:46:48 2002 +0000 +++ b/lisp/behavior.el Sun Mar 31 08:30:17 2002 +0000 @@ -1,6 +1,6 @@ ;;; behavior.el --- consistent interface onto behaviors -;; Copyright (C) 2000, 2001 Ben Wing. +;; Copyright (C) 2000, 2001, 2002 Ben Wing. ;; Author: Ben Wing ;; Maintainer: XEmacs Development Team @@ -35,7 +35,34 @@ ;;; Code: -(defvar behavior-hash-table (make-hash-table)) +;; Hash table mapping behavior names to property lists, with entries for +;; :short-doc, :require, :enable, and :disable. +(defconst behavior-hash-table (make-hash-table)) + +(defvar within-behavior-enabling-disabling nil) + +(defgroup behaviors nil + "Behaviors -- high-level functionality interface.") + +;; List of enabled behaviors. +(defcustom enabled-behavior-list nil + "List of currently enabled behaviors. +Normally, don't set it directly; use `enable-behavior' or `disable-behavior'." + :initialize #'set-default + :set #'(lambda (sym val) + (if within-behavior-enabling-disabling + (set sym val) + (let* ((old-val enabled-behavior-list) + (disable-list (set-difference old-val val)) + (enable-list (set-difference val old-val))) + (dolist (b disable-list) + (disable-behavior b t)) + (dolist (b enable-list) + (enable-behavior b t)) + (assert (equal enabled-behavior-list val))))) + :type '(repeat (symbol :tag "Behavior")) + :group 'behaviors) + (defvar behavior-history nil "History of entered behaviors.") @@ -46,12 +73,12 @@ when it's enabled and how to further control it (typically through custom variables). Accepted keywords are -:title A \"pretty\" version of the name, for use in menus. If omitted - a prettified name will be generated. -:require A single symbol or a list of such symbols, which need to be - present at enable time, or will be loaded using `require'. -:enable A function of no variables, which turns the behavior on. -:disable A function of no variables, which turns the behavior off. +:short-doc A \"pretty\" version of the name, for use in menus. If omitted + a prettified name will be generated. +:require A single symbol or a list of such symbols, which need to be + present at enable time, or will be loaded using `require'. +:enable A function of no variables, which turns the behavior on. +:disable A function of no variables, which turns the behavior off. Behaviors are assumed to be global, and to take effect immediately; if the underlying package is per-buffer, it may have to scan all existing @@ -62,13 +89,13 @@ practice. In such a case, attempting to disable the behavior will signal an error unless you use the `force' option." (cl-parsing-keywords - ((:title (capitalize-string-as-title (replace-in-string - (symbol-name name) "-" " "))) + ((:short-doc (capitalize-string-as-title (replace-in-string + (symbol-name name) "-" " "))) :require :enable :disable) () - (let ((entry (list :title cl-title :require cl-require + (let ((entry (list :short-doc cl-short-doc :require cl-require :enable cl-enable :disable cl-disable))) (puthash name entry behavior-hash-table)))) @@ -102,13 +129,17 @@ (intern result) result))) -(defun behavior-enabled-p (name)) +(defun behavior-enabled-p (behavior) + "Non-nil if BEHAVIOR (a symbol) if currently enabled." + (memq behavior enabled-behavior-list)) (defun enable-behavior (behavior &optional force) "Enable the specified behavior." (interactive (list (read-behavior "Enable Behavior: " t) current-prefix-arg)) (let ((plist (gethash behavior behavior-hash-table))) (or plist (error 'invalid-argument "Not a behavior" behavior)) + (or force (not (memq behavior enabled-behavior-list)) + (error 'invalid-change "Behavior already enabled" behavior)) (let ((require (getf plist :require)) (enable (getf plist :enable))) (cond ((listp require) @@ -117,7 +148,12 @@ (require require)) ((null require)) (t (error 'invalid-argument "Invalid :require spec" require))) - (if enable (funcall enable))))) + (message "Enabling behavior %s..." behavior) + (if enable (funcall enable)) + (message "Enabling behavior %s...done" behavior) + (let ((within-behavior-enabling-disabling t)) + (customize-set-variable 'enabled-behavior-list + (cons behavior enabled-behavior-list)))))) (defun disable-behavior (behavior &optional force) "Disable the specified behavior." @@ -125,6 +161,8 @@ current-prefix-arg)) (let ((plist (gethash behavior behavior-hash-table))) (or plist (error 'invalid-argument "Not a behavior" behavior)) + (or force (memq behavior enabled-behavior-list) + (error 'invalid-change "Behavior not enabled" behavior)) (let ((require (getf plist :require)) (disable (getf plist :disable))) (cond ((listp require) @@ -133,7 +171,12 @@ (require require)) ((null require)) (t (error 'invalid-argument "Invalid :require spec" require))) - (if disable (funcall disable))))) + (message "Disabling behavior %s..." behavior) + (if disable (funcall disable)) + (message "Disabling behavior %s...done" behavior) + (let ((within-behavior-enabling-disabling t)) + (customize-set-variable 'enabled-behavior-list + (delq behavior enabled-behavior-list)))))) (provide 'behavior)
--- a/lisp/cl-macs.el Sat Mar 30 04:46:48 2002 +0000 +++ b/lisp/cl-macs.el Sun Mar 31 08:30:17 2002 +0000 @@ -1,6 +1,7 @@ ;;; cl-macs.el --- Common Lisp extensions for XEmacs Lisp (part four) ;; Copyright (C) 1993 Free Software Foundation, Inc. +;; Copyright (C) 2002 Ben Wing. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Version: 2.02 @@ -597,17 +598,268 @@ ;;;###autoload (defmacro loop (&rest args) "(loop CLAUSE...): The Common Lisp `loop' macro. + +The loop macro consists of a series of clauses, which do things like +iterate variables, set conditions for exiting the loop, accumulating values +to be returned as the return value of the loop, and executing arbitrary +blocks of code. Each clause is proceed in turn, and the loop executes its +body repeatedly until an exit condition is hit. + +It's important to understand that loop clauses such as `for' and `while', +which look like loop-establishing constructs, don't actually *establish* a +loop\; the looping is established by the `loop' clause itself, which will +repeatedly process its body until told to stop. `while' merely establishes +a condition which, when true, causes the loop to finish, and `for' sets a +variable to different values on each iteration (e.g. successive elements of +a list) and sets an exit condition when there are no more values. This +means, for example, that if two `for' clauses appear, you don't get two +nested loops, but instead two variables that are stepped in parallel, and +two exit conditions, either of which, if triggered, will cause the loop to +end. Similarly for a loop with a `for' and a `while' clause. For example: + +\(loop + for x in list + while x + do ...) + +In each successive iteration, X is set to the next element of the list. If +there are no more elements, or if any element is nil (the `while' clause), +the loop exits. Otherwise, the block of code following `do' is executed.) + +This example also shows that some clauses establish variable bindings -- +essentially like a `let' binding -- and that following clauses can +reference these variables. Furthermore, the entire loop is surrounded by a +block named nil (unless the `named' clause is given), so you can return +from the loop using the macro `return'. (The other way to exit the loop is +through the macro `loop-finish'. The difference is that some loop clauses +establish or accumulate a value to be returned, and `loop-finish' returns +this. `return', however, can only return an explicitly-specified value. +NOTE CAREFULLY: There is a loop clause called `return' as well as a +standard Lisp macro called `return'. Normally they work similarly\; but if +you give the loop a name with `named', you will need to use the macro +`return-from'.) + +Another extremely useful feature of loops is called \"destructuring\". If, +in place of VAR, a list (possibly dotted, possibly a tree of arbitary +complexity) is given, the value to be assigned is assumed to have a similar +structure to the list given, and variables in the list will be matched up +with corresponding elements in the structure. For example: + +\(loop + for (x y) in '((foo 1) (bar 2) (baz 3)) + do (puthash x y some-hash-table)) + +will add three elements to a hash table, mapping foo -> 1, bar -> 2, and +baz -> 3. As other examples, you can conveniently process alists using + +\(loop for (x . y) in alist do ...) + +and plists using + +\(loop for (x y) on plist by #'cddr do ...) + +Destructuring is forgiving in that mismatches in the number of elements on +either size will be handled gracefully, either by ignoring or initializing +to nil. + +If you don't understand how a particular loop clause works, create an +example and use `macroexpand-sexp' to expand the macro. + Valid clauses are: - for VAR from/upfrom/downfrom NUM to/upto/downto/above/below NUM by NUM, - for VAR in LIST by FUNC, for VAR on LIST by FUNC, for VAR = INIT then EXPR, - for VAR across ARRAY, repeat NUM, with VAR = INIT, while COND, until COND, - always COND, never COND, thereis COND, collect EXPR into VAR, - append EXPR into VAR, nconc EXPR into VAR, sum EXPR into VAR, - count EXPR into VAR, maximize EXPR into VAR, minimize EXPR into VAR, - if COND CLAUSE [and CLAUSE]... else CLAUSE [and CLAUSE...], - unless COND CLAUSE [and CLAUSE]... else CLAUSE [and CLAUSE...], - do EXPRS..., initially EXPRS..., finally EXPRS..., return EXPR, - finally return EXPR, named NAME." + +\(NOTE: Keywords in lowercase\; slashes separate different possibilities +for keywords, some of which are synonymous\; brackets indicate optional +parts of the clause. In all of the clauses with `being', the word `being', +the words `each' or `the', and the difference between singular and plural +keywords are all just syntactic sugar. Stylistically, you should write +either `being each foo' or `being the foos'.) + + for VAR from/upfrom/downfrom NUM1 to/upto/downto/above/below NUM2 [by NUMSTEP] + Step VAR across numbers. `upfrom', `upto', and `below' explicitly + indicate upward stepping\; `downfrom', `downto', and `above' explicitly + indicate downward stepping. (If none of these is given, the default is + upward.) `to', `upto', and `downto' cause stepping to include NUM2 as + the last iteration, while `above' and `below' stop just before reaching + NUM2. `by' can be given to indicate a stepping increment other than 1. + + for VAR in LIST [by FUNC] + Step VAR over elements of a LIST. FUNC specifies how to get successive + sublists and defaults to `cdr'. + + for VAR on LIST [by FUNC] + Step VAR over tails of a LIST. FUNC specifies how to get successive + sublists and defaults to `cdr'. + + for VAR in-ref LIST [by FUNC] + Step VAR over elements of a LIST, like `for ... in', except the VAR is + bound using `symbol-macrolet' instead of `let'. In essence, VAR is set + to a \"reference\" to the list element instead of the element itself\; + this us, you can destructively modify the list using `setf' on VAR, and + any changes to the list will \"magically\" reflect themselves in + subsequent uses of VAR. + + for VAR = INIT [then EXPR] + Set VAR on each iteration of the loop. If only INIT is given, use it + on each iteration. Otherwise, use INIT on the first iteration and EXPR + on subsequent ones. + + for VAR across/across-ref ARRAY + Step VAR across a sequence other than a list (string, vector, bit + vector). If `across-ref' is given, VAR is bound using + `symbol-macrolet' instead of `let' -- see above. + + for VAR being each/the element/elements in/of/in-ref/of-ref SEQUENCE [using (index INDEX-VAR)] + Step VAR across any sequence. A variable can be specified with a + `using' phrase to receive the index, starting at 0. If `in-ref' or + `of-ref' is given, VAR is bound using `symbol-macrolet' instead of + `let' -- see above. + + for VAR being each/the hash-key/hash-keys/hash-value/hash-values in/of HASH-TABLE [using (hash-value/hash-key OTHER-VAR)] + + for VAR being each/the hash-key/hash-keys/hash-value/hash-values in/of HASH-TABLE [using (hash-value/hash-key OTHER-VAR)] + Map VAR over a hash table. The various keywords are synonymous except + those that distinguish between keys and values. The `using' phrase is + optional and allows both key and value to be bound. + + for VAR being each/the symbol/present-symbol/external-symbol/symbols/present-symbols/external-symbols in/of OBARRAY + Map VAR over the symbols in an obarray. All symbol keywords are + currently synonymous. + + for VAR being each/the extent/extents [in/of BUFFER-OR-STRING] [from POS] [to POS] + Map VAR over the extents in a buffer or string, defaulting to the + current buffer, the beginning and the end, respectively. + + for VAR being each/the interval/intervals [in/of BUFFER-OR-STRING] [property PROPERTY] [from POS] [to POS] + Map VAR over the intervals without property change in a buffer or + string, defaulting to the current buffer, the beginning and the end, + respectively. If PROPERTY is given, iteration occurs using + `next-single-property-change'\; otherwise, using + `next-property-change'. + + for VAR being each/the window/windows [in/of FRAME] + Step VAR over the windows in FRAME, defaulting to the selected frame. + + for VAR being each/the frame/frames + Step VAR over all frames. + + for VAR being each/the buffer/buffers [by FUNC] + Step VAR over all buffers. This is actually equivalent to + `for VAR in (buffer-list) [by FUNC]'. + + for VAR being each/the key-code/key-codes/key-seq/key-seqs/key-binding/key-bindings in KEYMAP [using (key-code/key-codes/key-seq/key-seqs/key-binding/key-bindings OTHER-VAR)] + Map VAR over the entries in a keymap. Keyword `key-seq' causes + recursive mapping over prefix keymaps occurring in the keymap, with VAR + getting the built-up sequence (a vector). Otherwise, mapping does not + occur recursively. `key-code' and `key-seq' refer to what is bound + (second argument of `define-key'), and `key-binding' what it's bound to + (third argument of `define-key'). + + as VAR ... + `as' is a synonym for `for'. + + and VAR ... + `and' clauses have the same syntax as `for' clauses except that the + variables in the clause are bound in parallel with a preceding + `and'/`for' clause instead of in series. + + with VAR = INIT + Set VAR to INIT once, before doing any iterations. + + repeat NUM + Exit the loop if more than NUM iterations have occurred. + + while COND + Exit the loop if COND isn't true. + + until COND + Exit the loop if COND is true. + + collect EXPR [into VAR] + Push EXPR onto the end of a list of values -- stored either in VAR or a + temporary variable that will be returned as the return value of the + loop if it terminates through an exit condition or a call to + `loop-finish'. + + append EXPR [into VAR] + Append EXPR (a list) onto the end of a list of values, like `collect'. + + nconc EXPR [into VAR] + Nconc EXPR (a list) onto the end of a list of values, like `collect'. + + concat EXPR [into VAR] + Concatenate EXPR (a string) onto the end of a string of values, like + `collect'. + + vconcat EXPR [into VAR] + Concatenate EXPR (a vector) onto the end of a vector of values, like + `collect'. + + bvconcat EXPR [into VAR] + Concatenate EXPR (a bit vector) onto the end of a bit vector of values, + like `collect'. + + sum EXPR [into VAR] + Add EXPR to a value, like `collect'. + + count EXPR [into VAR] + If EXPR is true, increment a value by 1, like `collect'. + + maximize EXPR [into VAR] + IF EXPR is greater than a value, replace the value with EXPR, like + `collect'. + + minimize EXPR [into VAR] + IF EXPR is less than a value, replace the value with EXPR, like + `collect'. + + always COND + If COND is true, continue the loop and set the loop return value (the + same value that's manipulated by `collect' and friends and is returned + by a normal loop exit or an exit using `loop-finish') to t\; otherwise, + exit the loop and return nil. The effect is to determine and return + whether a condition is true \"always\" (all iterations of the loop). + + never COND + If COND is false, continue the loop and set the loop return value (like + `always') to t\; otherwise, exit the loop and return nil. The effect + is to determine and return whether a condition is \"never\" true (all + iterations of the loop). + + thereis COND + If COND is true, exit the loop and return COND. + + if/when COND CLAUSE [and CLAUSE]... else CLAUSE [and CLAUSE...] + If COND is true, execute the directly following clause(s)\; otherwise, + execute the clauses following `else'. + + unless COND CLAUSE [and CLAUSE]... else CLAUSE [and CLAUSE...] + If COND is false, execute the directly following clause(s)\; otherwise, execute the clauses following `else'. + + do EXPRS... + Execute the expressions (any Lisp forms). + + initially EXPRS... + Execute EXPR once, before doing any iterations, and after values have + been set using `with'. + + finally EXPRS... + Execute EXPR once, directly before the loop terminates. This will not + be executed if the loop terminates prematurely as a result of `always', + `never', `thereis', or `return'. + + return EXPR + Exit from the loop and return EXPR. + + finally return EXPR + Specify the value to be returned when the loop exits. (Unlike `return', + this doesn't cause the loop to immediately exit\; it will exit whenever + it normally would have.) This takes precedence over a return value + specified with `collect' and friends or `always' and friends. + + named NAME + Specify the name for block surrounding the loop, in place of nil. + (See `block'.) +" (if (not (memq t (mapcar 'symbolp (delq nil (delq t (copy-list args)))))) (list 'block nil (list* 'while t args)) (let ((loop-name nil) (loop-bindings nil) @@ -882,16 +1134,19 @@ ((memq word key-types) (or (memq (car args) '(in of)) (error "Expected `of'")) - (let ((map (cl-pop2 args)) - (other (if (eq (car args) 'using) - (if (and (= (length (cadr args)) 2) - (memq (caadr args) key-types) - (not (eq (caadr args) word))) - (cadr (cl-pop2 args)) - (error "Bad `using' clause")) + (let* ((map (cl-pop2 args)) + other-word + (other (if (eq (car args) 'using) + (if (and (= (length (cadr args)) 2) + (memq (setq other-word (caadr args)) + key-types) + (not (eq (caadr args) word))) + (cadr (cl-pop2 args)) + (error "Bad `using' clause")) (gensym)))) - (if (memq word '(key-binding key-bindings)) - (setq var (prog1 other (setq other var)))) + (when (memq word '(key-binding key-bindings)) + (setq var (prog1 other (setq other var))) + (and other-word (setq word other-word))) (setq loop-map-form (list (if (memq word '(key-seq key-seqs)) 'cl-map-keymap-recursively 'cl-map-keymap) @@ -983,6 +1238,11 @@ (var (cl-loop-handle-accum []))) (cl-push (list 'progn (list 'callf 'vconcat var what) t) loop-body))) + ((memq word '(bvconcat bvconcating)) + (let ((what (cl-pop args)) + (var (cl-loop-handle-accum #*))) + (cl-push (list 'progn (list 'callf 'bvconcat var what) t) loop-body))) + ((memq word '(sum summing)) (let ((what (cl-pop args)) (var (cl-loop-handle-accum 0)))
--- a/lisp/dumped-lisp.el Sat Mar 30 04:46:48 2002 +0000 +++ b/lisp/dumped-lisp.el Sun Mar 31 08:30:17 2002 +0000 @@ -86,6 +86,8 @@ ; auto-gc-threshold "itimer-autosave" "printer" + "behavior" + "behavior-defs" "diagnose" ;;;;;;;;;;;;;;;;;; GUI support
--- a/lisp/lisp-mode.el Sat Mar 30 04:46:48 2002 +0000 +++ b/lisp/lisp-mode.el Sun Mar 31 08:30:17 2002 +0000 @@ -62,6 +62,20 @@ ["Evaluate %_Whole Buffer" ,(popup-wrap 'eval-current-buffer)] ["Evaluate Last %_S-expression" ,(popup-wrap 'eval-last-sexp)] "---" + ["%_Indent Region or Balanced Expression" + ,(popup-wrap '(if (region-exists-p) + (call-interactively 'indent-region) + (call-interactively 'indent-sexp)))] + ["I%_ndent Defun" + ,(popup-wrap '(progn + (beginning-of-defun) + (indent-sexp)))] + "---" + ["%_Comment Out Region" comment-region :active (region-exists-p)] + ["Unc%_omment Region" (comment-region (region-beginning) + (region-end) '(4)) + :active (region-exists-p)] + "---" ,@(if popup-p '(["%_Find Function" (find-function (menu-call-at-event '(function-at-point))) @@ -101,19 +115,10 @@ ["%_Untrace All Functions" untrace-all :active (fboundp 'untrace-all)] "---" - ["%_Comment Out Region" comment-region :active (region-exists-p)] - ["Unc%_omment Region" (comment-region (region-beginning) - (region-end) '(4)) - :active (region-exists-p)] - "---" - ["%_Indent Region or Balanced Expression" - ,(popup-wrap '(if (region-exists-p) - (call-interactively 'indent-region) - (call-interactively 'indent-sexp)))] - ["I%_ndent Defun" - ,(popup-wrap '(progn - (beginning-of-defun) - (indent-sexp)))] + ["Display %_Macro Expansion of Balanced Expression" + ,(popup-wrap 'macroexpand-sexp)] + ["Display Recursive Macro E%_xpansion of Balanced Expression" + ,(popup-wrap 'macroexpand-all-sexp)] "---" "Look for debug-on-error under Options->Troubleshooting" )))
--- a/lisp/menubar-items.el Sat Mar 30 04:46:48 2002 +0000 +++ b/lisp/menubar-items.el Sun Mar 31 08:30:17 2002 +0000 @@ -159,7 +159,13 @@ (function))) (defun menu-split-long-menu (menu) - "Split MENU according to `menu-max-items' and add accelerator specs." + "Split MENU according to `menu-max-items' and add accelerator specs. + +You should normally use the idiom + +\(menu-split-long-menu (menu-sort-menu menu)) + +See also `menu-sort-menu'." (let ((len (length menu))) (if (or (null menu-max-items) (<= len menu-max-items)) @@ -194,7 +200,13 @@ (submenu-generate-accelerator-spec (nreverse result)))))) (defun menu-sort-menu (menu) - "Sort MENU alphabetically." + "Sort MENU alphabetically. + +You should normally use the idiom + +\(menu-split-long-menu (menu-sort-menu menu)) + +See also `menu-split-long-menu'." (sort menu #'(lambda (a b) (string-lessp (aref a 0) (aref b 0))))) @@ -801,6 +813,23 @@ ) ("%_Options" + ("%_Behaviors" + :filter + (lambda (menu) + (menu-split-long-menu + (menu-sort-menu + (loop for behavior being the hash-keys in behavior-hash-table + using (hash-value plist) + collect (vector (format "%s (%s)" behavior + (getf plist :short-doc)) + `(if (memq ',behavior enabled-behavior-list) + (disable-behavior ',behavior) + (enable-behavior ',behavior)) + :style 'toggle + :selected `(memq ',behavior + enabled-behavior-list)) + ))))) + ("%_Advanced (Customize)" ("%_Emacs" :filter (lambda (&rest junk) (cdr (custom-menu-create 'emacs))))
--- a/lisp/window.el Sat Mar 30 04:46:48 2002 +0000 +++ b/lisp/window.el Sun Mar 31 08:30:17 2002 +0000 @@ -125,6 +125,44 @@ ; walk-windows-history)) ; (funcall function walk-windows-current)))) +(defun get-window-with-predicate (predicate &optional minibuf + all-frames default) + "Return a window satisfying PREDICATE. + +This function cycles through all visible windows using `walk-windows', +calling PREDICATE on each one. PREDICATE is called with a window as +argument. The first window for which PREDICATE returns a non-nil +value is returned. If no window satisfies PREDICATE, DEFAULT is +returned. + +Optional second arg MINIBUF t means count the minibuffer window even +if not active. MINIBUF nil or omitted means count the minibuffer iff +it is active. MINIBUF neither t nor nil means not to count the +minibuffer even if it is active. + +Several frames may share a single minibuffer; if the minibuffer +counts, all windows on all frames that share that minibuffer count +too. Therefore, if you are using a separate minibuffer frame +and the minibuffer is active and MINIBUF says it counts, +`walk-windows' includes the windows in the frame from which you +entered the minibuffer, as well as the minibuffer window. + +ALL-FRAMES is the optional third argument. +ALL-FRAMES nil or omitted means cycle within the frames as specified above. +ALL-FRAMES = `visible' means include windows on all visible frames. +ALL-FRAMES = 0 means include windows on all visible and iconified frames. +ALL-FRAMES = t means include windows on all frames including invisible frames. +If ALL-FRAMES is a frame, it means include windows on that frame. +Anything else means restrict to the selected frame." + (catch 'found + (walk-windows #'(lambda (window) + (when (funcall predicate window) + (throw 'found window))) + minibuf all-frames) + default)) + +(defalias 'some-window 'get-window-with-predicate) + (defun minibuffer-window-active-p (window) "Return t if WINDOW (a minibuffer window) is now active." (eq window (active-minibuffer-window))) @@ -149,7 +187,9 @@ (defun count-windows (&optional minibuf) "Return the number of visible windows. -Optional arg MINIBUF non-nil means count the minibuffer +This counts the windows in the selected frame and (if the minibuffer is +to be counted) its minibuffer frame (if that's not the same frame). +The optional arg MINIBUF non-nil means count the minibuffer even if it is inactive." (let ((count 0)) (walk-windows (function (lambda (w) @@ -157,6 +197,17 @@ minibuf) count)) +(defun window-safely-shrinkable-p (&optional window) + "Non-nil if the WINDOW can be shrunk without shrinking other windows. +If WINDOW is nil or omitted, it defaults to the currently selected window." + (save-selected-window + (when window (select-window window)) + (or (and (not (eq window (frame-first-window))) + (= (car (window-pixel-edges)) + (car (window-pixel-edges (previous-window))))) + (= (car (window-pixel-edges)) + (car (window-pixel-edges (next-window))))))) + (defun balance-windows () "Make all visible windows the same height (approximately)." (interactive) @@ -286,6 +337,145 @@ (interactive "p") (shrink-window arg t)) +; (defun window-buffer-height (window) +; "Return the height (in screen lines) of the buffer that WINDOW is displaying." +; (save-excursion +; (set-buffer (window-buffer window)) +; (goto-char (point-min)) +; (let ((ignore-final-newline +; ;; If buffer ends with a newline, ignore it when counting height +; ;; unless point is after it. +; (and (not (eobp)) (eq ?\n (char-after (1- (point-max))))))) +; (+ 1 (nth 2 (compute-motion (point-min) +; '(0 . 0) +; (- (point-max) (if ignore-final-newline 1 0)) +; (cons 0 100000000) +; (window-width window) +; nil +; window)))))) + +(defun count-screen-lines (&optional beg end count-final-newline window) + "Return the number of screen lines in the region. +The number of screen lines may be different from the number of actual lines, +due to line breaking, display table, etc. + +Optional arguments BEG and END default to `point-min' and `point-max' +respectively. + +If region ends with a newline, ignore it unless optional third argument +COUNT-FINAL-NEWLINE is non-nil. + +The optional fourth argument WINDOW specifies the window used for obtaining +parameters such as width, horizontal scrolling, and so on. The default is +to use the selected window's parameters. + +Like `vertical-motion', `count-screen-lines' always uses the current buffer, +regardless of which buffer is displayed in WINDOW. This makes possible to use +`count-screen-lines' in any buffer, whether or not it is currently displayed +in some window." + (unless beg + (setq beg (point-min))) + (unless end + (setq end (point-max))) + (if (= beg end) + 0 + (save-excursion + (save-restriction + (widen) + (narrow-to-region (min beg end) + (if (and (not count-final-newline) + (= ?\n (char-before (max beg end)))) + (1- (max beg end)) + (max beg end))) + (goto-char (point-min)) + (1+ (vertical-motion (buffer-size) window)))))) + +; (defun fit-window-to-buffer (&optional window max-height min-height) +; "Make WINDOW the right size to display its contents exactly. +; If WINDOW is omitted or nil, it defaults to the selected window. +; If the optional argument MAX-HEIGHT is supplied, it is the maximum height +; the window is allowed to be, defaulting to the frame height. +; If the optional argument MIN-HEIGHT is supplied, it is the minimum +; height the window is allowed to be, defaulting to `window-min-height'. + +; The heights in MAX-HEIGHT and MIN-HEIGHT include the mode-line and/or +; header-line." +; (interactive) + +; (when (null window) +; (setq window (selected-window))) +; (when (null max-height) +; (setq max-height (frame-height (window-frame window)))) + +; (let* ((buf +; ;; Buffer that is displayed in WINDOW +; (window-buffer window)) +; (window-height +; ;; The current height of WINDOW +; (window-height window)) +; (desired-height +; ;; The height necessary to show the buffer displayed by WINDOW +; ;; (`count-screen-lines' always works on the current buffer). +; (with-current-buffer buf +; (+ (count-screen-lines) +; ;; If the buffer is empty, (count-screen-lines) is +; ;; zero. But, even in that case, we need one text line +; ;; for cursor. +; (if (= (point-min) (point-max)) +; 1 0) +; ;; For non-minibuffers, count the mode-line, if any +; (if (and (not (window-minibuffer-p window)) +; mode-line-format) +; 1 0) +; ;; Count the header-line, if any +; (if header-line-format 1 0)))) +; (delta +; ;; Calculate how much the window height has to change to show +; ;; desired-height lines, constrained by MIN-HEIGHT and MAX-HEIGHT. +; (- (max (min desired-height max-height) +; (or min-height window-min-height)) +; window-height)) +; ;; We do our own height checking, so avoid any restrictions due to +; ;; window-min-height. +; (window-min-height 1)) + +; ;; Don't try to redisplay with the cursor at the end +; ;; on its own line--that would force a scroll and spoil things. +; (when (with-current-buffer buf +; (and (eobp) (bolp) (not (bobp)))) +; (set-window-point window (1- (window-point window)))) + +; (save-selected-window +; (select-window window) + +; ;; Adjust WINDOW to the nominally correct size (which may actually +; ;; be slightly off because of variable height text, etc). +; (unless (zerop delta) +; (enlarge-window delta)) + +; ;; Check if the last line is surely fully visible. If not, +; ;; enlarge the window. +; (let ((end (with-current-buffer buf +; (save-excursion +; (goto-char (point-max)) +; (when (and (bolp) (not (bobp))) +; ;; Don't include final newline +; (backward-char 1)) +; (when truncate-lines +; ;; If line-wrapping is turned off, test the +; ;; beginning of the last line for visibility +; ;; instead of the end, as the end of the line +; ;; could be invisible by virtue of extending past +; ;; the edge of the window. +; (forward-line 0)) +; (point))))) +; (set-window-vscroll window 0) +; (while (and (< desired-height max-height) +; (= desired-height (window-height window)) +; (not (pos-visible-in-window-p end window))) +; (enlarge-window 1) +; (setq desired-height (1+ desired-height))))))) + (defun shrink-window-if-larger-than-buffer (&optional window) "Shrink the WINDOW to be as small as possible to display its contents. Do not shrink to less than `window-min-height' lines.
--- a/nt/ChangeLog Sat Mar 30 04:46:48 2002 +0000 +++ b/nt/ChangeLog Sun Mar 31 08:30:17 2002 +0000 @@ -1,3 +1,10 @@ +2002-03-31 Ben Wing <ben@xemacs.org> + + * config.inc.samp (DEBUG_XEMACS): + * xemacs.mak (DEBUG_XEMACS): + * xemacs.mak (ERROR_CHECK_ALL): New. + Separate out and add new variable for controlling error-checking. + 2002-03-29 Jonathan Harris <jonathan@xemacs.org> * make-nt-depend:
--- a/nt/config.inc.samp Sat Mar 30 04:46:48 2002 +0000 +++ b/nt/config.inc.samp Sun Mar 31 08:30:17 2002 +0000 @@ -65,6 +65,12 @@ # Set this to enable some debug code that doesn't slow things down. DEBUG_XEMACS=1 +# Uncomment this to turn off or on the error-checking code, which adds +# abundant internal error checking (and slows things down a lot). Normally, +# leave this alone -- it will be on for beta builds and off for release +# builds. +# ERROR_CHECK_ALL=0 + # Set this to speed up building, for development purposes. QUICK_BUILD=0
--- a/nt/xemacs.mak Sat Mar 30 04:46:48 2002 +0000 +++ b/nt/xemacs.mak Sun Mar 31 08:30:17 2002 +0000 @@ -170,6 +170,10 @@ !if !defined(DEBUG_XEMACS) DEBUG_XEMACS=0 !endif +!if !defined(ERROR_CHECK_ALL) +# Turn off when not a beta XEmacs. +ERROR_CHECK_ALL=1 +!endif !if !defined(QUICK_BUILD) QUICK_BUILD=0 !endif
--- a/src/ChangeLog Sat Mar 30 04:46:48 2002 +0000 +++ b/src/ChangeLog Sun Mar 31 08:30:17 2002 +0000 @@ -1,3 +1,254 @@ +2002-03-31 Ben Wing <ben@xemacs.org> + + * s/windowsnt.h: + Use new ERROR_CHECK_ALL; not related to DEBUG_XEMACS. + +2002-03-31 Ben Wing <ben@xemacs.org> + + * alloc.c: + * alloc.c (resize_string): + * alloc.c (make_string): + * alloc.c (make_string_nocopy): + * alloc.c (common_init_alloc_once_early): + * backtrace.h: + * buffer.c: + * buffer.c (print_buffer): + * buffer.c (Fkill_buffer): + * buffer.h: + * buffer.h (membpos_to_bytebpos): + * bytecode.c (print_compiled_function): + * callproc.c (Fold_call_process_internal): + * casetab.c (print_case_table): + * charset.h (CHARSET_BY_LEADING_BYTE): + * charset.h (MAKE_CHAR): + * charset.h (breakup_char_1): + * chartab.c: + * chartab.c (print_chartab_range): + * chartab.c (print_chartab_two_byte_charset): + * chartab.c (print_char_table): + * chartab.c (Fchar_table_p): + * chartab.c (Fchar_table_type_list): + * chartab.c (Fvalid_char_table_type_p): + * chartab.c (Fchar_table_type): + * chartab.c (Fput_char_table): + * chartab.c (check_category_char): + * cmdloop.c: + * config.h.in: + * console-msw.c (GetConsoleHwnd): + * console-stream.c: + * console-tty.c: + * console-tty.c (tty_init_console): + * console.c: + * console.c (print_console): + * console.h (error_check_console_type): + * data.c (print_weak_list): + * device-msw.c: + * device-msw.c (mswindows_handle_page_setup_dialog_box): + * device-msw.c (print_devmode): + * device.c: + * device.c (print_device): + * device.h (error_check_device_type): + * dired-msw.c: + * dired-msw.c (Fmswindows_insert_directory): + * dired.c: + * dumper.c: + * dumper.c (pdump_file_get): + * dumper.c (pdump_resource_get): + * dumper.c (pdump_load): + * editfns.c: + * editfns.c (save_excursion_save): + * eldap.c (print_ldap): + * elhash.c: + * elhash.c (check_hash_table_invariants): + * elhash.c (print_hash_table_data): + * elhash.c (print_hash_table): + * elhash.c (free_hentries): + * emacs.c (vars_of_emacs): + * eval.c: + * eval.c (internal_catch): + * eval.c (unwind_to_catch): + * eval.c (condition_case_1): + * eval.c (check_error_state_sanity): + * event-Xt.c: + * event-Xt.c (x_to_emacs_keysym): + * event-gtk.c (gtk_to_emacs_keysym): + * event-msw.c: + * event-msw.c (mswindows_wnd_proc): + * event-stream.c: + * events.c: + * events.c (print_event): + * events.c (transfer_event_chain_pointer): + * extents.c (print_extent_1): + * extents.c (print_extent): + * faces.c (print_face): + * file-coding.c: + * file-coding.c (print_coding_system_in_print_method): + * file-coding.c (coding_closer): + * file-coding.c (make_coding_stream_1): + * file-coding.c (make_coding_input_stream): + * file-coding.c (make_coding_output_stream): + * file-coding.c (encode_decode_coding_region): + * file-coding.c (chain_init_coding_streams_1): + * file-coding.c (undecided_convert): + * file-coding.c (detect_coding_stream): + * file-coding.h: + * file-coding.h (_coding_system_data): + * file-coding.h (XSETCODING_SYSTEM_OF_TYPE): + * file-coding.h (struct coding_stream): + * fileio.c: + * frame-msw.c: + * frame.c: + * frame.c (print_frame): + * frame.h: + * frame.h (error_check_frame_type): + * glyphs-gtk.c: + * glyphs-gtk.c (gtk_print_image_instance): + * glyphs-gtk.c (write_lisp_string_to_temp_file): + * glyphs-msw.c: + * glyphs-msw.c (mswindows_print_image_instance): + * glyphs-msw.c (mswindows_progress_gauge_redisplay): + * glyphs-shared.c: + * glyphs-widget.c: + * glyphs-x.c (x_print_image_instance): + * glyphs-x.c (x_progress_gauge_redisplay): + * glyphs.c: + * glyphs.c (print_image_instance): + * glyphs.c (print_glyph): + * glyphs.h: + * glyphs.h (GLYPH_CACHEL_WIDTH): + * glyphs.h (GLYPH_CACHEL_GLYPH): + * insdel.c (fixup_internal_substring): + * insdel.c (buffer_insert_lisp_string_1): + * intl-auto-encap-win32.c: + * intl-auto-encap-win32.c (qxeGetLongPathName): + * intl-auto-encap-win32.h: + * intl-encap-win32.c: + * intl-encap-win32.c (qxeDefMDIChildProc): + * intl-win32.c (mswindows_multibyte_to_unicode_print): + * keymap.c (print_keymap): + * lisp-union.h: + * lisp-union.h (wrap_pointer_1): + * lisp.h: + * lread.c (Fload_internal): + * lrecord.h: + * lrecord.h (MAKE_LRECORD_IMPLEMENTATION): + * lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION): + * lrecord.h (wrap_record_1): + * lstream.c (print_lstream): + * lstream.h (error_check_lstream_type): + * macros.c: + * marker.c: + * marker.c (print_marker): + * marker.c (unchain_marker): + * marker.c (bi_marker_position): + * marker.c (set_bi_marker_position): + * md5.c: + * md5.c (Fmd5): + * menubar-x.c: + * menubar-x.c (command_builder_operate_menu_accelerator): + * menubar.c: + * mule-coding.c (iso2022_print): + * mule-coding.c (FROB): + * ntproc.c (_DebPrint): + * ntproc.c (new_child): + * ntproc.c (create_child): + * ntproc.c (find_child_console): + * ntproc.c (kill_will_disappear_soon): + * objects-gtk.c (gtk_print_color_instance): + * objects-gtk.c (gtk_print_font_instance): + * objects-msw.c: + * objects-msw.c (mswindows_font_instance_truename): + * objects-x.c: + * objects-x.c (x_print_color_instance): + * objects-x.c (x_print_font_instance): + * objects.c: + * objects.c (print_color_instance): + * objects.c (print_font_instance): + * opaque.c: + * opaque.c (print_opaque): + * opaque.c (print_opaque_ptr): + * print.c: + * print.c (write_string_1): + * print.c (default_object_printer): + * print.c (internal_object_printer): + * print.c (print_internal): + * process-nt.c (send_signal_the_95_way): + * process-nt.c (get_internet_address): + * process-unix.c (unix_send_process): + * process.c: + * process.c (print_process): + * process.c (init_process_io_handles): + * rangetab.c: + * rangetab.c (print_range_table): + * redisplay-msw.c: + * redisplay-output.c (sync_display_line_structs): + * redisplay.c: + * redisplay.c (ensure_modeline_generated): + * redisplay.c (redisplay_without_hooks): + * redisplay.c (sledgehammer_check_redisplay_structs_1): + * regex.c: + * regex.c (re_match_2_internal): + * scrollbar-msw.c: + * select-msw.c: + * select-msw.c (mswindows_selection_data_type_name): + * signal.c: + * specifier.c: + * specifier.c (print_specifier): + * specifier.h: + * specifier.h (_specifier_data): + * symbols.c (mark_symbol_value_buffer_local): + * symbols.c (print_symbol_value_magic): + * sysdep.c: + * syswindows.h: + * syswindows.h (ERROR_WHEN_NONINTERCEPTED_FUNS_USED): + * text.c: + * text.c (bytecount_to_charcount): + * text.c (charcount_to_bytecount): + * text.c (charbpos_to_bytebpos_func): + * text.c (bytebpos_to_charbpos_func): + * text.c (dfc_convert_to_external_format): + * text.c (dfc_convert_to_internal_format): + * text.c (Lstream_get_emchar_1): + * text.h: + * text.h (DECLARE_INLINE_HEADER): + * toolbar-msw.c: + * tooltalk.c (print_tooltalk_message): + * tooltalk.c (print_tooltalk_pattern): + * ui-gtk.c (ffi_object_printer): + * ui-gtk.c (emacs_gtk_object_printer): + * ui-gtk.c (emacs_gtk_boxed_printer): + * unicode.c: + * unicode.c (Fchar_to_unicode): + * unicode.c (unicode_print): + * unicode.c (syms_of_unicode): + * window.c: + * window.c (print_window): + * window.c (print_window_config): + + Redo error-checking macros: ERROR_CHECK_TYPECHECK -> + ERROR_CHECK_TYPES, ERROR_CHECK_CHARBPOS -> ERROR_CHECK_TEXT, add + ERROR_CHECK_DISPLAY, ERROR_CHECK_STRUCTURES. Document these in + config.h.in. Fix code to follow docs. Fix *_checking_assert() + in accordance with new names. + + Attempt to fix periodic redisplay crash freeing display line + structures. Add first implementation of sledgehammer redisplay + check. + + Redo print_*() to use write_fmt_string(), write_fmt_string_lisp(). + + Fix bug in md5 handling. + + Rename character-to-unicode to char-to-unicode; same for + unicode-to-char{acter}. + + Move chartab documentation to `make-char-table'. + + Some header cleanup. + + Clean up remaining places where nonintercepted Windows calls are + being used. + 2002-03-29 Jonathan Harris <jonathan@xemacs.org> * device-msw.c (plist_get_margin): Add arg specifying mm or inches
--- a/src/EmacsFrame.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/EmacsFrame.c Sun Mar 31 08:30:17 2002 +0000 @@ -29,19 +29,21 @@ #include <config.h> #include "lisp.h" +#include "device.h" +#include "faces.h" +#include "frame.h" +#include "toolbar.h" +#include "window.h" + #include "console-x.h" #include "glyphs-x.h" #include "objects-x.h" + #include <X11/Shell.h> #include "EmacsFrameP.h" #include "EmacsManager.h" /* for EmacsManagerChangeSize */ #include "xmu.h" -#include "faces.h" -#include "frame.h" -#include "toolbar.h" -#include "window.h" - static void EmacsFrameClassInitialize (void); static void EmacsFrameInitialize (Widget, Widget, ArgList, Cardinal *); static void EmacsFrameRealize (Widget, XtValueMask*, XSetWindowAttributes*);
--- a/src/alloc.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/alloc.c Sun Mar 31 08:30:17 2002 +0000 @@ -161,7 +161,7 @@ /* Non-zero means we're in the process of doing the dump */ int purify_flag; -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES Error_Behavior ERROR_ME, ERROR_ME_NOT, ERROR_ME_WARN, ERROR_ME_DEBUG_WARN; @@ -1876,7 +1876,7 @@ verify_string_chars_integrity (); #endif -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT if (pos >= 0) { assert (pos <= XSTRING_LENGTH (s)); @@ -1888,7 +1888,7 @@ if (delta < 0) assert ((-delta) <= XSTRING_LENGTH (s)); } -#endif /* ERROR_CHECK_CHARBPOS */ +#endif /* ERROR_CHECK_TEXT */ if (delta == 0) /* simplest case: no size change. */ @@ -2137,7 +2137,7 @@ Lisp_Object val; /* Make sure we find out about bad make_string's when they happen */ -#if defined (ERROR_CHECK_CHARBPOS) && defined (MULE) +#if defined (ERROR_CHECK_TEXT) && defined (MULE) bytecount_to_charcount (contents, length); /* Just for the assertions */ #endif @@ -2202,7 +2202,7 @@ Lisp_Object val; /* Make sure we find out about bad make_string_nocopy's when they happen */ -#if defined (ERROR_CHECK_CHARBPOS) && defined (MULE) +#if defined (ERROR_CHECK_TEXT) && defined (MULE) bytecount_to_charcount (contents, length); /* Just for the assertions */ #endif @@ -4124,7 +4124,7 @@ gc_currently_forbidden = 0; gc_hooks_inhibited = 0; -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES ERROR_ME.really_unlikely_name_to_have_accidentally_in_a_non_errb_structure = 666; ERROR_ME_NOT. @@ -4135,7 +4135,7 @@ ERROR_ME_DEBUG_WARN. really_unlikely_name_to_have_accidentally_in_a_non_errb_structure = 8675309; -#endif /* ERROR_CHECK_TYPECHECK */ +#endif /* ERROR_CHECK_TYPES */ } static void
--- a/src/backtrace.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/backtrace.h Sun Mar 31 08:30:17 2002 +0000 @@ -276,7 +276,7 @@ } \ } while (0) -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_STRUCTURES #define CHECK_SPECBIND_VARIABLE assert (specpdl_ptr->func == 0) #else #define CHECK_SPECBIND_VARIABLE DO_NOTHING
--- a/src/buffer.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/buffer.c Sun Mar 31 08:30:17 2002 +0000 @@ -72,6 +72,7 @@ #include "chartab.h" #include "casetab.h" #include "commands.h" +#include "device.h" #include "elhash.h" #include "extents.h" #include "faces.h" @@ -259,15 +260,9 @@ else if (!BUFFER_LIVE_P (b)) write_c_string ("#<killed buffer>", printcharfun); else if (escapeflag) - { - write_c_string ("#<buffer ", printcharfun); - print_internal (b->name, printcharfun, 1); - write_c_string (">", printcharfun); - } + write_fmt_string_lisp (printcharfun, "#<buffer %S>", 1, b->name); else - { - print_internal (b->name, printcharfun, 0); - } + print_internal (b->name, printcharfun, 0); } /* We do not need a finalize method to handle a buffer's children list @@ -1288,7 +1283,7 @@ uninit_buffer_extents (b); if (b->base_buffer) { -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_STRUCTURES assert (!NILP (memq_no_quit (buf, b->base_buffer->indirect_children))); #endif b->base_buffer->indirect_children =
--- a/src/buffer.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/buffer.h Sun Mar 31 08:30:17 2002 +0000 @@ -359,7 +359,7 @@ INLINE_HEADER Bytebpos membpos_to_bytebpos (struct buffer *buf, Membpos x) { -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT assert (valid_membpos_p (buf, x)); #endif return (Bytebpos) ((x > (Membpos) buf->text->gpt) ? @@ -493,7 +493,7 @@ # define VALID_BYTEBPOS_P(buf, x) 1 #endif -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT # define ASSERT_VALID_BYTEBPOS_UNSAFE(buf, x) do { \ assert (BUFFER_LIVE_P (buf)); \ @@ -511,12 +511,12 @@ assert (VALID_BYTEBPOS_P (buf, x)); \ } while (0) -#else /* not ERROR_CHECK_CHARBPOS */ +#else /* not ERROR_CHECK_TEXT */ # define ASSERT_VALID_BYTEBPOS_UNSAFE(buf, x) # define ASSERT_VALID_BYTEBPOS_BACKWARD_UNSAFE(buf, x) # define ASSERT_VALID_BYTEBPOS_FORWARD_UNSAFE(buf, x) -#endif /* not ERROR_CHECK_CHARBPOS */ +#endif /* not ERROR_CHECK_TEXT */ /* Note that, although the Mule version will work fine for non-Mule as well (it should reduce down to nothing), we provide a separate @@ -548,7 +548,7 @@ # define VALIDATE_BYTEBPOS_FORWARD(buf, x) #endif -/* Note that in the simplest case (no MULE, no ERROR_CHECK_CHARBPOS), +/* Note that in the simplest case (no MULE, no ERROR_CHECK_TEXT), this crap reduces down to simply (x)++. */ #define INC_BYTEBPOS(buf, x) do \ @@ -562,7 +562,7 @@ VALIDATE_BYTEBPOS_FORWARD (buf, x); \ } while (0) -/* Note that in the simplest case (no MULE, no ERROR_CHECK_CHARBPOS), +/* Note that in the simplest case (no MULE, no ERROR_CHECK_TEXT), this crap reduces down to simply (x)--. */ #define DEC_BYTEBPOS(buf, x) do \ @@ -703,17 +703,17 @@ #endif /* not MULE */ -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT Bytebpos charbpos_to_bytebpos (struct buffer *buf, Charbpos x); Charbpos bytebpos_to_charbpos (struct buffer *buf, Bytebpos x); -#else /* not ERROR_CHECK_CHARBPOS */ +#else /* not ERROR_CHECK_TEXT */ #define charbpos_to_bytebpos real_charbpos_to_bytebpos #define bytebpos_to_charbpos real_bytebpos_to_charbpos -#endif /* not ERROR_CHECK_CHARBPOS */ +#endif /* not ERROR_CHECK_TEXT */ #define make_charbpos(buf, ind) make_int (bytebpos_to_charbpos (buf, ind))
--- a/src/bytecode.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/bytecode.c Sun Mar 31 08:30:17 2002 +0000 @@ -1898,7 +1898,6 @@ int docp = f->flags.documentationp; int intp = f->flags.interactivep; struct gcpro gcpro1, gcpro2; - char buf[100]; GCPRO2 (obj, printcharfun); write_c_string (print_readably ? "#[" : "#<compiled-function ", printcharfun); @@ -1907,11 +1906,7 @@ { Lisp_Object ann = compiled_function_annotation (f); if (!NILP (ann)) - { - write_c_string ("(from ", printcharfun); - print_internal (ann, printcharfun, 1); - write_c_string (") ", printcharfun); - } + write_fmt_string_lisp (printcharfun, "(from %S) ", 1, ann); } #endif /* COMPILED_FUNCTION_ANNOTATION_HACK */ /* COMPILED_ARGLIST = 0 */ @@ -1926,9 +1921,8 @@ if (STRINGP (instructions) && !print_readably) { /* We don't usually want to see that junk in the bytecode. */ - sprintf (buf, "\"...(%ld)\"", - (long) XSTRING_CHAR_LENGTH (instructions)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "\"...(%ld)\"", + (long) XSTRING_CHAR_LENGTH (instructions)); } else print_internal (instructions, printcharfun, escapeflag); @@ -1940,8 +1934,7 @@ print_internal (compiled_function_constants (f), printcharfun, escapeflag); /* COMPILED_STACK_DEPTH = 3 */ - sprintf (buf, " %d", compiled_function_stack_depth (f)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " %d", compiled_function_stack_depth (f)); /* COMPILED_DOC_STRING = 4 */ if (docp || intp)
--- a/src/callproc.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/callproc.c Sun Mar 31 08:30:17 2002 +0000 @@ -469,7 +469,7 @@ make_coding_input_stream (XLSTREAM (instream), get_coding_system_for_text_file (Vcoding_system_for_read, 1), - CODING_DECODE); + CODING_DECODE, 0); Lstream_set_character_mode (XLSTREAM (instream)); NGCPRO1 (instream); while (1)
--- a/src/casetab.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/casetab.c Sun Mar 31 08:30:17 2002 +0000 @@ -74,12 +74,9 @@ print_case_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { Lisp_Case_Table *ct = XCASE_TABLE (obj); - char buf[200]; if (print_readably) printing_unreadable_object ("#<case-table 0x%x", ct->header.uid); - write_c_string ("#<case-table ", printcharfun); - sprintf (buf, "0x%x>", ct->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "#<case-table 0x%x>", ct->header.uid); } static const struct lrecord_description case_table_description [] = {
--- a/src/charset.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/charset.h Sun Mar 31 08:30:17 2002 +0000 @@ -342,11 +342,11 @@ { extern struct charset_lookup *chlook; -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TEXT /* When error-checking is on, x86 GCC 2.95.2 -O3 miscompiles the following unless we introduce `tem'. */ int tem = lb; - type_checking_assert (tem >= MIN_LEADING_BYTE && tem <= 0xFF); + text_checking_assert (tem >= MIN_LEADING_BYTE && tem <= 0xFF); #endif return chlook->charset_by_leading_byte[lb - MIN_LEADING_BYTE]; } @@ -491,7 +491,7 @@ FIELD1_TO_PRIVATE_LEADING_BYTE) << 14) | ((c1) << 7) | (c2); } -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT INLINE_HEADER Emchar MAKE_CHAR (Lisp_Object charset, int c1, int c2); INLINE_HEADER Emchar MAKE_CHAR (Lisp_Object charset, int c1, int c2) @@ -520,7 +520,7 @@ INLINE_HEADER void breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2) { - charbpos_checking_assert (valid_char_p (c)); + text_checking_assert (valid_char_p (c)); *charset = CHAR_CHARSET (c); BREAKUP_CHAR_1_UNSAFE (c, *charset, *c1, *c2); }
--- a/src/chartab.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/chartab.c Sun Mar 31 08:30:17 2002 +0000 @@ -222,19 +222,10 @@ Lisp_Object printcharfun) { if (first != last) - { - write_c_string (" (", printcharfun); - print_internal (make_char (first), printcharfun, 0); - write_c_string (" ", printcharfun); - print_internal (make_char (last), printcharfun, 0); - write_c_string (") ", printcharfun); - } + write_fmt_string_lisp (printcharfun, " (%s %s)", 2, + make_char (first), make_char (last)); else - { - write_c_string (" ", printcharfun); - print_internal (make_char (first), printcharfun, 0); - write_c_string (" ", printcharfun); - } + write_fmt_string_lisp (printcharfun, " %s ", 1, make_char (first)); print_internal (val, printcharfun, 1); } @@ -302,13 +293,9 @@ if (!CHAR_TABLE_ENTRYP (jen)) { - char buf[100]; - - write_c_string (" [", printcharfun); - print_internal (XCHARSET_NAME (charset), printcharfun, 0); - sprintf (buf, " %d] ", i); - write_c_string (buf, printcharfun); - print_internal (jen, printcharfun, 0); + write_fmt_string_lisp (printcharfun, " [%s %d] %s", + 3, XCHARSET_NAME (charset), + make_int (i), jen); } else print_chartab_charset_row (charset, i, XCHAR_TABLE_ENTRY (jen), @@ -368,11 +355,8 @@ continue; if (!CHAR_TABLE_ENTRYP (ann)) { - write_c_string (" ", printcharfun); - print_internal (XCHARSET_NAME (charset), - printcharfun, 0); - write_c_string (" ", printcharfun); - print_internal (ann, printcharfun, 0); + write_fmt_string_lisp (printcharfun, " %s %s", 2, + XCHARSET_NAME (charset), ann); } else { @@ -445,36 +429,6 @@ DEFUN ("char-table-p", Fchar_table_p, 1, 1, 0, /* Return non-nil if OBJECT is a char table. - -A char table is a table that maps characters (or ranges of characters) -to values. Char tables are specialized for characters, only allowing -particular sorts of ranges to be assigned values. Although this -loses in generality, it makes for extremely fast (constant-time) -lookups, and thus is feasible for applications that do an extremely -large number of lookups (e.g. scanning a buffer for a character in -a particular syntax, where a lookup in the syntax table must occur -once per character). - -When Mule support exists, the types of ranges that can be assigned -values are - --- all characters --- an entire charset --- a single row in a two-octet charset --- a single character - -When Mule support is not present, the types of ranges that can be -assigned values are - --- all characters --- a single character - -To create a char table, use `make-char-table'. -To modify a char table, use `put-char-table' or `remove-char-table'. -To retrieve the value for a particular character, use `get-char-table'. -See also `map-char-table', `clear-char-table', `copy-char-table', -`valid-char-table-type-p', `char-table-type-list', -`valid-char-table-value-p', and `check-char-table-value'. */ (object)) { @@ -483,7 +437,7 @@ DEFUN ("char-table-type-list", Fchar_table_type_list, 0, 0, 0, /* Return a list of the recognized char table types. -See `valid-char-table-type-p'. +See `make-char-table'. */ ()) { @@ -496,31 +450,7 @@ DEFUN ("valid-char-table-type-p", Fvalid_char_table_type_p, 1, 1, 0, /* Return t if TYPE if a recognized char table type. - -Each char table type is used for a different purpose and allows different -sorts of values. The different char table types are - -`category' - Used for category tables, which specify the regexp categories - that a character is in. The valid values are nil or a - bit vector of 95 elements. Higher-level Lisp functions are - provided for working with category tables. Currently categories - and category tables only exist when Mule support is present. -`char' - A generalized char table, for mapping from one character to - another. Used for case tables, syntax matching tables, - `keyboard-translate-table', etc. The valid values are characters. -`generic' - An even more generalized char table, for mapping from a - character to anything. -`display' - Used for display tables, which specify how a particular character - is to appear when displayed. #### Not yet implemented. -`syntax' - Used for syntax tables, which specify the syntax of a particular - character. Higher-level Lisp functions are provided for - working with syntax tables. The valid values are integers. - +See `make-char-table'. */ (type)) { @@ -535,7 +465,7 @@ DEFUN ("char-table-type", Fchar_table_type, 1, 1, 0, /* Return the type of CHAR-TABLE. -See `valid-char-table-type-p'. +See `make-char-table'. */ (char_table)) { @@ -595,8 +525,60 @@ DEFUN ("make-char-table", Fmake_char_table, 1, 1, 0, /* Return a new, empty char table of type TYPE. -Currently recognized types are 'char, 'category, 'display, 'generic, -and 'syntax. See `valid-char-table-type-p'. + +A char table is a table that maps characters (or ranges of characters) +to values. Char tables are specialized for characters, only allowing +particular sorts of ranges to be assigned values. Although this +loses in generality, it makes for extremely fast (constant-time) +lookups, and thus is feasible for applications that do an extremely +large number of lookups (e.g. scanning a buffer for a character in +a particular syntax, where a lookup in the syntax table must occur +once per character). + +When Mule support exists, the types of ranges that can be assigned +values are + +-- all characters +-- an entire charset +-- a single row in a two-octet charset +-- a single character + +When Mule support is not present, the types of ranges that can be +assigned values are + +-- all characters +-- a single character + +To create a char table, use `make-char-table'. +To modify a char table, use `put-char-table' or `remove-char-table'. +To retrieve the value for a particular character, use `get-char-table'. +See also `map-char-table', `clear-char-table', `copy-char-table', +`char-table-p', `valid-char-table-type-p', `char-table-type-list', +`valid-char-table-value-p', and `check-char-table-value'. + +Each char table type is used for a different purpose and allows different +sorts of values. The different char table types are + +`category' + Used for category tables, which specify the regexp categories + that a character is in. The valid values are nil or a + bit vector of 95 elements. Higher-level Lisp functions are + provided for working with category tables. Currently categories + and category tables only exist when Mule support is present. +`char' + A generalized char table, for mapping from one character to + another. Used for case tables, syntax matching tables, + `keyboard-translate-table', etc. The valid values are characters. +`generic' + An even more generalized char table, for mapping from a + character to anything. +`display' + Used for display tables, which specify how a particular character + is to appear when displayed. #### Not yet implemented. +`syntax' + Used for syntax tables, which specify the syntax of a particular + character. Higher-level Lisp functions are provided for + working with syntax tables. The valid values are integers. */ (type)) { @@ -1149,7 +1131,7 @@ -- A single character VALUE must be a value appropriate for the type of CHAR-TABLE. -See `valid-char-table-type-p'. +See `make-char-table'. */ (range, value, char_table)) { @@ -1619,10 +1601,8 @@ { REGISTER Lisp_Object temp; Lisp_Char_Table *ctbl; -#ifdef ERROR_CHECK_TYPECHECK if (NILP (Fcategory_table_p (table))) wtaerror ("Expected category table", table); -#endif ctbl = XCHAR_TABLE (table); temp = get_char_table (ch, ctbl); if (NILP (temp))
--- a/src/cm.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/cm.c Sun Mar 31 08:30:17 2002 +0000 @@ -26,11 +26,13 @@ #include <config.h> #include "lisp.h" -#include "console-tty.h" +#include "device.h" #include "frame.h" #include "lstream.h" #include "redisplay.h" +#include "console-tty.h" + #define EXPENSIVE 2000 EXTERN_C char *tgoto (const char *cm, int hpos, int vpos);
--- a/src/cmdloop.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/cmdloop.c Sun Mar 31 08:30:17 2002 +0000 @@ -32,6 +32,7 @@ #include "lisp.h" #include "buffer.h" +#include "device.h" #include "commands.h" #include "frame.h" #include "events.h"
--- a/src/config.h.in Sat Mar 30 04:46:48 2002 +0000 +++ b/src/config.h.in Sun Mar 31 08:30:17 2002 +0000 @@ -486,14 +486,16 @@ change is done, and do other extent-related checks. */ #undef ERROR_CHECK_EXTENTS -/* Make sure that all X... macros are dereferencing the correct type, - and that all XSET... macros (as much as possible) are setting the - correct type of structure. Highly recommended for all - development work. */ -#undef ERROR_CHECK_TYPECHECK +/* Turn on checks related to types -- make sure that all X... macros are + dereferencing the correct type, and that all XSET... macros (as much as + possible) are setting the correct type of structure; check any other + places that a specific type is expected. */ +#undef ERROR_CHECK_TYPES -/* Make sure valid buffer positions are passed to BUF_* macros. */ -#undef ERROR_CHECK_CHARBPOS +/* Turn on checks related to text -- check that text in strings and buffers + is in a valid format before we use it, check that buffer positions are + valid, etc. */ +#undef ERROR_CHECK_TEXT /* Attempt to catch bugs related to garbage collection (e.g. not GCPRO'ing). */ #undef ERROR_CHECK_GC @@ -509,6 +511,13 @@ widgets. */ #undef ERROR_CHECK_GLYPHS +/* Sanity-check the redisplay structures after each modification. */ +#undef ERROR_CHECK_DISPLAY + +/* Define for any sanity checks on structures that are not handled by a + more specific error-checking type. */ +#undef ERROR_CHECK_STRUCTURES + /* Define DEBUG_XEMACS if you want extra debugging code compiled in. This is mainly intended for use by developers. */ #undef DEBUG_XEMACS @@ -601,7 +610,6 @@ #endif /* WIN32_NO_CONFIGURE */ - /* USER_FULL_NAME returns a string that is the user's full name. It can assume that the variable `pw' points to the password file entry for this user. @@ -937,9 +945,21 @@ # define HAVE_WIN32_CODING_SYSTEMS #endif +#ifdef ERROR_CHECK_ALL +#define ERROR_CHECK_EXTENTS +#define ERROR_CHECK_TYPES +#define ERROR_CHECK_TEXT +#define ERROR_CHECK_GC +#define ERROR_CHECK_MALLOC +#define ERROR_CHECK_BYTE_CODE +#define ERROR_CHECK_GLYPHS +#define ERROR_CHECK_DISPLAY +#define ERROR_CHECK_STRUCTURES +#endif /* ERROR_CHECK_ALL */ + /* Move these down here so that the s/m files (esp. windowsnt.h) can set them. */ -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES #define type_checking_assert(assertion) assert (assertion) #define type_checking_assert_at_line(assertion, file, line) \ assert_at_line (assertion, file, line) @@ -947,14 +967,6 @@ #define type_checking_assert(assertion) #define type_checking_assert_at_line(assertion, file, line) #endif -#ifdef ERROR_CHECK_CHARBPOS -#define charbpos_checking_assert(assertion) assert (assertion) -#define charbpos_checking_assert_at_line(assertion, file, line) \ - assert_at_line (assertion, file, line) -#else -#define charbpos_checking_assert(assertion) -#define charbpos_checking_assert_at_line(assertion, file, line) -#endif #ifdef ERROR_CHECK_GC #define gc_checking_assert(assertion) assert (assertion) #define gc_checking_assert_at_line(assertion, file, line) \ @@ -963,5 +975,13 @@ #define gc_checking_assert(assertion) #define gc_checking_assert_at_line(assertion, file, line) #endif +#ifdef ERROR_CHECK_TEXT +#define text_checking_assert(assertion) assert (assertion) +#define text_checking_assert_at_line(assertion, file, line) \ + assert_at_line (assertion, file, line) +#else +#define text_checking_assert(assertion) +#define text_checking_assert_at_line(assertion, file, line) +#endif #endif /* _SRC_CONFIG_H_ */
--- a/src/console-msw.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/console-msw.c Sun Mar 31 08:30:17 2002 +0000 @@ -87,29 +87,39 @@ static HWND mswindows_console_hwnd = 0; -#define KLUDGE_BUFSIZE 1024 /* buffer size for console window titles */ - -/* Direct from the horse's mouth: Microsoft KB article Q124103 */ +/* Based on Microsoft KB article Q124103 */ static HWND GetConsoleHwnd (void) { - HWND hwndFound; /* this is what is returned to the caller */ - char pszNewWindowTitle[KLUDGE_BUFSIZE]; /* contains fabricated WindowTitle */ - char pszOldWindowTitle[KLUDGE_BUFSIZE]; /* contains original WindowTitle */ + HWND hwndFound; + Intbyte newtitleint[200]; + Extbyte *newtitle; + Extbyte *oldtitle; + int numchars; /* fetch current window title */ - GetConsoleTitle (pszOldWindowTitle, KLUDGE_BUFSIZE); - - /* format a "unique" NewWindowTitle */ + { + int size = 64; + do + { + size *= 2; + oldtitle = alloca_extbytes (size * XETCHAR_SIZE); + numchars = qxeGetConsoleTitle (oldtitle, size); + } + while (numchars >= size - 1); + } - sprintf (pszNewWindowTitle, "%ld/%ld", - GetTickCount (), - GetCurrentProcessId ()); + /* format a "unique" new title */ + + qxesprintf (newtitleint, "%ld/%ld", GetTickCount (), + GetCurrentProcessId ()); + + C_STRING_TO_TSTR (newtitleint, newtitle); /* change current window title */ - SetConsoleTitle (pszNewWindowTitle); + qxeSetConsoleTitle (newtitle); /* ensure window title has been updated */ @@ -117,13 +127,13 @@ /* look for NewWindowTitle */ - hwndFound=FindWindow (NULL, pszNewWindowTitle); + hwndFound = qxeFindWindow (NULL, newtitle); /* restore original window title */ - SetConsoleTitle (pszOldWindowTitle); + qxeSetConsoleTitle (oldtitle); - return (hwndFound); + return hwndFound; } static HWND
--- a/src/console-stream.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/console-stream.c Sun Mar 31 08:30:17 2002 +0000 @@ -28,14 +28,17 @@ #include <config.h> #include "lisp.h" -#include "console-stream.h" -#include "console-tty.h" +#include "device.h" #include "events.h" #include "frame.h" #include "redisplay.h" #include "sysdep.h" +#include "window.h" + +#include "console-stream.h" +#include "console-tty.h" + #include "sysfile.h" -#include "window.h" DEFINE_CONSOLE_TYPE (stream);
--- a/src/console-tty.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/console-tty.c Sun Mar 31 08:30:17 2002 +0000 @@ -1,7 +1,7 @@ /* TTY console functions. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1994, 1995 Free Software Foundation, Inc. - Copyright (C) 1996, 2001 Ben Wing. + Copyright (C) 1996, 2001, 2002 Ben Wing. This file is part of XEmacs. @@ -116,14 +116,14 @@ tty_con->instream = make_coding_input_stream (XLSTREAM (tty_con->instream), get_coding_system_for_text_file (Qkeyboard, 0), - CODING_DECODE); + CODING_DECODE, 0); Lstream_set_buffering (XLSTREAM (tty_con->instream), LSTREAM_UNBUFFERED, 0); Lstream_set_character_mode (XLSTREAM (tty_con->instream)); tty_con->outstream = make_filedesc_output_stream (tty_con->outfd, 0, -1, 0); tty_con->outstream = make_coding_output_stream (XLSTREAM (tty_con->outstream), get_coding_system_for_text_file (Qterminal, 0), - CODING_ENCODE); + CODING_ENCODE, 0); tty_con->terminal_type = terminal_type; tty_con->controlling_process = controlling_process;
--- a/src/console.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/console.c Sun Mar 31 08:30:17 2002 +0000 @@ -1,6 +1,6 @@ /* The console object. Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. - Copyright (C) 1996 Ben Wing. + Copyright (C) 1996, 2002 Ben Wing. This file is part of XEmacs. @@ -27,13 +27,15 @@ #include "lisp.h" #include "buffer.h" -#include "console-tty.h" +#include "device.h" #include "events.h" #include "frame.h" #include "redisplay.h" #include "sysdep.h" #include "window.h" +#include "console-tty.h" + Lisp_Object Vconsole_list, Vselected_console; Lisp_Object Vcreate_console_hook, Vdelete_console_hook; @@ -119,22 +121,17 @@ print_console (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { struct console *con = XCONSOLE (obj); - char buf[256]; if (print_readably) printing_unreadable_object ("#<console %s 0x%x>", XSTRING_DATA (con->name), con->header.uid); - sprintf (buf, "#<%s-console", !CONSOLE_LIVE_P (con) ? "dead" : - CONSOLE_TYPE_NAME (con)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "#<%s-console", + !CONSOLE_LIVE_P (con) ? "dead" : CONSOLE_TYPE_NAME (con)); if (CONSOLE_LIVE_P (con) && !NILP (CONSOLE_CONNECTION (con))) - { - write_c_string (" on ", printcharfun); - print_internal (CONSOLE_CONNECTION (con), printcharfun, 1); - } - sprintf (buf, " 0x%x>", con->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string_lisp (printcharfun, " on %S", 1, + CONSOLE_CONNECTION (con)); + write_fmt_string (printcharfun, " 0x%x>", con->header.uid); } DEFINE_LRECORD_IMPLEMENTATION ("console", console,
--- a/src/console.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/console.h Sun Mar 31 08:30:17 2002 +0000 @@ -486,7 +486,7 @@ #define CONSOLE_TYPE_P(con, type) EQ (CONSOLE_TYPE (con), Q##type) -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES INLINE_HEADER struct console * error_check_console_type (struct console *con, Lisp_Object sym); INLINE_HEADER struct console *
--- a/src/data.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/data.c Sun Mar 31 08:30:17 2002 +0000 @@ -1589,12 +1589,9 @@ if (print_readably) printing_unreadable_object ("#<weak-list>"); - write_c_string ("#<weak-list ", printcharfun); - print_internal (encode_weak_list_type (XWEAK_LIST (obj)->type), - printcharfun, 0); - write_c_string (" ", printcharfun); - print_internal (XWEAK_LIST (obj)->list, printcharfun, escapeflag); - write_c_string (">", printcharfun); + write_fmt_string_lisp (printcharfun, "#<weak-list %s %S>", 2, + encode_weak_list_type (XWEAK_LIST (obj)->type), + XWEAK_LIST (obj)->list); } static int
--- a/src/device-msw.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/device-msw.c Sun Mar 31 08:30:17 2002 +0000 @@ -38,12 +38,15 @@ #include <config.h> #include "lisp.h" +#include "device.h" +#include "events.h" +#include "faces.h" +#include "frame.h" + #include "console-msw.h" #include "console-stream.h" #include "objects-msw.h" -#include "events.h" -#include "faces.h" -#include "frame.h" + #include "sysdep.h" /* win32 DDE management library globals */ @@ -860,7 +863,7 @@ if ((UNBOUNDP (device) && UNBOUNDP (settings)) || (!UNBOUNDP (device) && !UNBOUNDP (settings))) sferror ("Exactly one of :device and :printer-settings must be given", - keys); + keys); if (UNBOUNDP (device)) device = settings; @@ -871,8 +874,8 @@ DWORD data; qxeGetLocaleInfo (LOCALE_USER_DEFAULT, - LOCALE_IMEASURE|LOCALE_RETURN_NUMBER, - (Extbyte *) &data, sizeof(data)); + LOCALE_IMEASURE | LOCALE_RETURN_NUMBER, + (Extbyte *) &data, sizeof (data)); memset (&pd, 0, sizeof (pd)); pd.lStructSize = sizeof (pd); @@ -1068,25 +1071,16 @@ print_devmode (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { - CIntbyte buf[100]; Lisp_Devmode *dm = XDEVMODE (obj); if (print_readably) printing_unreadable_object ("#<msprinter-settings 0x%x>", dm->header.uid); write_c_string ("#<msprinter-settings", printcharfun); if (!NILP (dm->printer_name)) - { - write_c_string (" for ", printcharfun); - print_internal (dm->printer_name, printcharfun, 1); - } + write_fmt_string_lisp (printcharfun, " for %S", 1, dm->printer_name); if (!NILP (dm->device)) - { - write_c_string (" (currently on ", printcharfun); - print_internal (dm->device, printcharfun, 0); - write_c_string (")", printcharfun); - } - sprintf (buf, " 0x%x>", dm->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string_lisp (printcharfun, " (currently on %s)", 1, dm->device); + write_fmt_string (printcharfun, " 0x%x>", dm->header.uid); } static void
--- a/src/device-tty.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/device-tty.c Sun Mar 31 08:30:17 2002 +0000 @@ -27,8 +27,7 @@ #include <config.h> #include "lisp.h" -#include "console-tty.h" -#include "console-stream.h" +#include "device.h" #include "events.h" #include "faces.h" #include "frame.h" @@ -36,6 +35,9 @@ #include "redisplay.h" #include "sysdep.h" +#include "console-tty.h" +#include "console-stream.h" + #include "sysfile.h" #include "syssignal.h" /* for SIGWINCH */
--- a/src/device-x.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/device-x.c Sun Mar 31 08:30:17 2002 +0000 @@ -30,18 +30,8 @@ #include <config.h> #include "lisp.h" -#include "console-x.h" -#include "xintrinsicp.h" /* CoreP.h needs this */ -#include <X11/CoreP.h> /* Numerous places access the fields of - a core widget directly. We could - use XtGetValues(), but ... */ -#include "xgccache.h" -#include <X11/Shell.h> -#include "xmu.h" -#include "glyphs-x.h" -#include "objects-x.h" - #include "buffer.h" +#include "device.h" #include "elhash.h" #include "events.h" #include "faces.h" @@ -50,9 +40,21 @@ #include "sysdep.h" #include "window.h" +#include "console-x.h" +#include "glyphs-x.h" +#include "objects-x.h" + #include "sysfile.h" #include "systime.h" +#include "xintrinsicp.h" /* CoreP.h needs this */ +#include <X11/CoreP.h> /* Numerous places access the fields of + a core widget directly. We could + use XtGetValues(), but ... */ +#include "xgccache.h" +#include <X11/Shell.h> +#include "xmu.h" + #if defined(HAVE_SHLIB) && defined(LWLIB_USES_ATHENA) && !defined(HAVE_ATHENA_3D) #include "sysdll.h" #endif /* HAVE_SHLIB and LWLIB_USES_ATHENA and not HAVE_ATHENA_3D */
--- a/src/device.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/device.c Sun Mar 31 08:30:17 2002 +0000 @@ -1,7 +1,7 @@ /* Generic device functions. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1994, 1995 Free Software Foundation, Inc. - Copyright (C) 1995, 1996 Ben Wing + Copyright (C) 1995, 1996, 2002 Ben Wing This file is part of XEmacs. @@ -39,6 +39,7 @@ #include "redisplay.h" #include "specifier.h" #include "sysdep.h" +#include "toolbar.h" #include "window.h" #ifdef HAVE_SCROLLBARS @@ -99,22 +100,16 @@ print_device (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { struct device *d = XDEVICE (obj); - char buf[256]; if (print_readably) printing_unreadable_object ("#<device %s 0x%x>", XSTRING_DATA (d->name), d->header.uid); - sprintf (buf, "#<%s-device", !DEVICE_LIVE_P (d) ? "dead" : - DEVICE_TYPE_NAME (d)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "#<%s-device", !DEVICE_LIVE_P (d) ? "dead" : + DEVICE_TYPE_NAME (d)); if (DEVICE_LIVE_P (d) && !NILP (DEVICE_CONNECTION (d))) - { - write_c_string (" on ", printcharfun); - print_internal (DEVICE_CONNECTION (d), printcharfun, 1); - } - sprintf (buf, " 0x%x>", d->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string_lisp (printcharfun, " on %S", 1, DEVICE_CONNECTION (d)); + write_fmt_string (printcharfun, " 0x%x>", d->header.uid); } DEFINE_LRECORD_IMPLEMENTATION ("device", device,
--- a/src/device.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/device.h Sun Mar 31 08:30:17 2002 +0000 @@ -156,7 +156,7 @@ #define DEVICE_TYPE_P(d, type) EQ (DEVICE_TYPE (d), Q##type) -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES INLINE_HEADER struct device * error_check_device_type (struct device *d, Lisp_Object sym); INLINE_HEADER struct device *
--- a/src/dired-msw.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/dired-msw.c Sun Mar 31 08:30:17 2002 +0000 @@ -1,7 +1,7 @@ /* fast dired replacement routines for mswindows. Copyright (C) 1998 Darryl Okahata Portions Copyright (C) 1992, 1994 by Sebastian Kremer <sk@thp.uni-koeln.de> - Copyright (C) 2000, 2001 Ben Wing. + Copyright (C) 2000, 2001, 2002 Ben Wing. This file is part of XEmacs. @@ -546,15 +546,13 @@ total_size += floor ((file_size + 512.) / 1024.); } { - Intbyte tempbuf[666]; - - qxesprintf (tempbuf, + write_fmt_string (wrap_buffer (current_buffer), #if INDENT_LISTING - /* ANSI C compilers auto-concatenate adjacent strings */ - " " + /* ANSI C compilers auto-concatenate adjacent + strings */ + " " #endif - "total %.0f\n", total_size); - buffer_insert1 (current_buffer, build_intstring (tempbuf)); + "total %.0f\n", total_size); } } for (i = 0; i < Dynarr_length (files); ++i)
--- a/src/dired.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/dired.c Sun Mar 31 08:30:17 2002 +0000 @@ -24,17 +24,18 @@ #include <config.h> #include "lisp.h" -#include "sysfile.h" -#include "sysdir.h" -#include "systime.h" -#include "sysdep.h" -#include "syspwd.h" #include "buffer.h" #include "commands.h" #include "elhash.h" +#include "opaque.h" #include "regex.h" -#include "opaque.h" #include "syntax.h" +#include "sysdep.h" + +#include "sysdir.h" +#include "sysfile.h" +#include "syspwd.h" +#include "systime.h" #ifdef WIN32_NATIVE #include "syswindows.h"
--- a/src/dumper.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/dumper.c Sun Mar 31 08:30:17 2002 +0000 @@ -22,6 +22,8 @@ /* Synched up with: Not in FSF. */ +/* !!#### Not yet Mule-ized */ + #include <config.h> #include "lisp.h" @@ -1505,7 +1507,7 @@ pdump_file_get (const char *path) { - pdump_hFile = CreateFile (path, + pdump_hFile = CreateFileA (path, GENERIC_READ + GENERIC_WRITE, /* Required for copy on write */ 0, /* Not shared */ NULL, /* Not inheritable */ @@ -1516,7 +1518,7 @@ return 0; pdump_length = GetFileSize (pdump_hFile, NULL); - pdump_hMap = CreateFileMapping (pdump_hFile, + pdump_hMap = CreateFileMappingA (pdump_hFile, NULL, /* No security attributes */ PAGE_WRITECOPY, /* Copy on write */ 0, /* Max size, high half */ @@ -1559,7 +1561,7 @@ other than the dumped data, which should be private to each process, we make the whole resource section read/write so we don't have to copy it. */ - hRes = FindResource (NULL, MAKEINTRESOURCE(101), "DUMP"); + hRes = FindResourceA (NULL, MAKEINTRESOURCE (101), "DUMP"); if (hRes == NULL) return 0; @@ -1684,7 +1686,7 @@ { Extbyte exe_path[PATH_MAX]; #ifdef WIN32_NATIVE - GetModuleFileName (NULL, exe_path, PATH_MAX); + GetModuleFileNameA (NULL, exe_path, PATH_MAX); #else /* !WIN32_NATIVE */ Extbyte *w; const Extbyte *dir, *p;
--- a/src/editfns.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/editfns.c Sun Mar 31 08:30:17 2002 +0000 @@ -30,22 +30,23 @@ #include "lisp.h" #include "buffer.h" +#include "casetab.h" +#include "chartab.h" #include "commands.h" +#include "device.h" #include "events.h" /* for EVENTP */ #include "extents.h" #include "frame.h" #include "insdel.h" +#include "line-number.h" #include "window.h" -#include "casetab.h" -#include "chartab.h" -#include "line-number.h" +#include "sysdep.h" +#include "sysdir.h" +#include "sysfile.h" +#include "sysproc.h" /* for qxe_getpid() */ +#include "syspwd.h" #include "systime.h" -#include "sysdep.h" -#include "syspwd.h" -#include "sysproc.h" /* for qxe_getpid() */ -#include "sysfile.h" -#include "sysdir.h" /* Some static data, and a function to initialize it for each run */ @@ -332,7 +333,7 @@ /* #### Huh? --hniksic */ /*if (preparing_for_armageddon) return Qnil;*/ -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT assert (XINT (Fpoint (Qnil)) == XINT (Fmarker_position (Fpoint_marker (Qt, Qnil)))); #endif
--- a/src/eldap.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/eldap.c Sun Mar 31 08:30:17 2002 +0000 @@ -106,19 +106,15 @@ static void print_ldap (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { - char buf[32]; - Lisp_LDAP *ldap = XLDAP (obj); if (print_readably) printing_unreadable_object ("#<ldap %s>", XSTRING_DATA (ldap->host)); - write_c_string ("#<ldap ", printcharfun); - print_internal (ldap->host, printcharfun, 1); + write_fmt_string_lisp (printcharfun, "#<ldap %S", 1, ldap->host); if (!ldap->ld) write_c_string ("(dead) ",printcharfun); - sprintf (buf, " 0x%lx>", (long)ldap); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " 0x%lx>", (long)ldap); } static Lisp_LDAP *
--- a/src/elhash.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/elhash.c Sun Mar 31 08:30:17 2002 +0000 @@ -1,6 +1,6 @@ /* Implementation of the hash table lisp object type. Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. - Copyright (C) 1995, 1996 Ben Wing. + Copyright (C) 1995, 1996, 2002 Ben Wing. Copyright (C) 1997 Free Software Foundation, Inc. This file is part of XEmacs. @@ -120,15 +120,7 @@ (probe = entries, !HENTRY_CLEAR_P (probe)) : 0); \ probe++) -#ifndef ERROR_CHECK_HASH_TABLE -# ifdef ERROR_CHECK_TYPECHECK -# define ERROR_CHECK_HASH_TABLE 1 -# else -# define ERROR_CHECK_HASH_TABLE 0 -# endif -#endif - -#if ERROR_CHECK_HASH_TABLE +#ifdef ERROR_CHECK_STRUCTURES static void check_hash_table_invariants (Lisp_Hash_Table *ht) { @@ -335,8 +327,7 @@ break; } print_internal (e->key, printcharfun, 1); - write_c_string (" ", printcharfun); - print_internal (e->value, printcharfun, 1); + write_fmt_string_lisp (printcharfun, " %S", 1, e->value); count++; } @@ -347,7 +338,6 @@ print_hash_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { Lisp_Hash_Table *ht = XHASH_TABLE (obj); - char buf[128]; write_c_string (print_readably ? "#s(hash-table" : "#<hash-table", printcharfun); @@ -367,21 +357,21 @@ if (ht->count || !print_readably) { if (print_readably) - sprintf (buf, " size %ld", (long) ht->count); + write_fmt_string (printcharfun, " size %ld", (long) ht->count); else - sprintf (buf, " size %ld/%ld", (long) ht->count, (long) ht->size); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " size %ld/%ld", (long) ht->count, + (long) ht->size); } if (ht->weakness != HASH_TABLE_NON_WEAK) { - sprintf (buf, " weakness %s", - (ht->weakness == HASH_TABLE_WEAK ? "key-and-value" : - ht->weakness == HASH_TABLE_KEY_WEAK ? "key" : - ht->weakness == HASH_TABLE_VALUE_WEAK ? "value" : - ht->weakness == HASH_TABLE_KEY_VALUE_WEAK ? "key-or-value" : - "you-d-better-not-see-this")); - write_c_string (buf, printcharfun); + write_fmt_string + (printcharfun, " weakness %s", + (ht->weakness == HASH_TABLE_WEAK ? "key-and-value" : + ht->weakness == HASH_TABLE_KEY_WEAK ? "key" : + ht->weakness == HASH_TABLE_VALUE_WEAK ? "value" : + ht->weakness == HASH_TABLE_KEY_VALUE_WEAK ? "key-or-value" : + "you-d-better-not-see-this")); } if (ht->count) @@ -391,15 +381,14 @@ write_c_string (")", printcharfun); else { - sprintf (buf, " 0x%x>", ht->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " 0x%x>", ht->header.uid); } } static void free_hentries (hentry *hentries, size_t size) { -#if ERROR_CHECK_HASH_TABLE +#ifdef ERROR_CHECK_STRUCTURES /* Ensure a crash if other code uses the discarded entries afterwards. */ hentry *e, *sentinel;
--- a/src/emacs.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/emacs.c Sun Mar 31 08:30:17 2002 +0000 @@ -3850,10 +3850,14 @@ are: extents - check extents prior to each extent change; -typecheck - check types strictly, aborting in case of error; +types - check types strictly; malloc - check operation of malloc; gc - check garbage collection; -charbpos - check buffer positions. +text - check text and buffer positions; +display - check redisplay structure consistency; +glyphs - check glyph structure consistency; +byte-code - check byte-code consistency;. +structures - check other structure consistency. quick-build - user has requested the "quick-build" configure option. */ ); @@ -3862,8 +3866,8 @@ Vinternal_error_checking = Fcons (intern ("extents"), Vinternal_error_checking); #endif -#ifdef ERROR_CHECK_TYPECHECK - Vinternal_error_checking = Fcons (intern ("typecheck"), +#ifdef ERROR_CHECK_TYPES + Vinternal_error_checking = Fcons (intern ("types"), Vinternal_error_checking); #endif #ifdef ERROR_CHECK_MALLOC @@ -3874,8 +3878,24 @@ Vinternal_error_checking = Fcons (intern ("gc"), Vinternal_error_checking); #endif -#ifdef ERROR_CHECK_CHARBPOS - Vinternal_error_checking = Fcons (intern ("charbpos"), +#ifdef ERROR_CHECK_TEXT + Vinternal_error_checking = Fcons (intern ("text"), + Vinternal_error_checking); +#endif +#ifdef ERROR_CHECK_DISPLAY + Vinternal_error_checking = Fcons (intern ("display"), + Vinternal_error_checking); +#endif +#ifdef ERROR_CHECK_GLYPHS + Vinternal_error_checking = Fcons (intern ("glyphs"), + Vinternal_error_checking); +#endif +#ifdef ERROR_CHECK_BYTE_CODE + Vinternal_error_checking = Fcons (intern ("byte-code"), + Vinternal_error_checking); +#endif +#ifdef ERROR_CHECK_STRUCTURES + Vinternal_error_checking = Fcons (intern ("structures"), Vinternal_error_checking); #endif #ifdef QUICK_BUILD
--- a/src/eval.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/eval.c Sun Mar 31 08:30:17 2002 +0000 @@ -280,8 +280,11 @@ static int throw_level; #endif -#ifdef ERROR_CHECK_TYPECHECK -void check_error_state_sanity (void); +#ifdef ERROR_CHECK_STRUCTURES +static void check_error_state_sanity (void); +#define CHECK_ERROR_STATE_SANITY() check_error_state_sanity () +#else +#define CHECK_ERROR_STATE_SANITY() #endif @@ -1326,9 +1329,7 @@ c.val = (*func) (arg); if (threw) *threw = 0; catchlist = c.next; -#ifdef ERROR_CHECK_TYPECHECK - check_error_state_sanity (); -#endif + CHECK_ERROR_STATE_SANITY (); return c.val; } @@ -1380,9 +1381,7 @@ handlers. */ unbind_to (catchlist->pdlcount); catchlist = catchlist->next; -#ifdef ERROR_CHECK_TYPECHECK - check_error_state_sanity (); -#endif + CHECK_ERROR_STATE_SANITY (); } while (! last_time); #else @@ -1409,9 +1408,7 @@ /* Unwind the specpdl stack */ unbind_to (c->pdlcount); catchlist = c->next; -#ifdef ERROR_CHECK_TYPECHECK - check_error_state_sanity (); -#endif + CHECK_ERROR_STATE_SANITY (); #endif /* Former code */ gcprolist = c->gcpro; @@ -1705,9 +1702,7 @@ GCPRO3 (harg, c.val, c.tag); catchlist = c.next; -#ifdef ERROR_CHECK_TYPECHECK - check_error_state_sanity (); -#endif + CHECK_ERROR_STATE_SANITY (); /* Note: The unbind also resets Vcondition_handlers. Maybe we should delete this here. */ Vcondition_handlers = XCDR (c.tag); @@ -2129,8 +2124,8 @@ for (;;) Fsignal (sig, data); } -#ifdef ERROR_CHECK_TYPECHECK -void +#ifdef ERROR_CHECK_STRUCTURES +static void check_error_state_sanity (void) { struct catchtag *c;
--- a/src/event-Xt.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/event-Xt.c Sun Mar 31 08:30:17 2002 +0000 @@ -25,23 +25,29 @@ #include <config.h> #include "lisp.h" -#include "console-x.h" -#include "../lwlib/lwlib.h" -#include "EmacsFrame.h" - #include "blocktype.h" #include "charset.h" #include "console.h" -#include "console-tty.h" +#include "device.h" +#include "elhash.h" #include "events.h" +#include "file-coding.h" #include "frame.h" -#include "objects-x.h" +#include "glyphs.h" +#include "lstream.h" #include "process.h" #include "redisplay.h" -#include "elhash.h" - +#include "window.h" + +#include "console-tty.h" + +#include "console-x.h" +#include "objects-x.h" +#include "../lwlib/lwlib.h" +#include "EmacsFrame.h" + +#include "sysproc.h" /* for MAXDESC */ #include "systime.h" -#include "sysproc.h" /* for MAXDESC */ #include "xintrinsicp.h" /* CoreP.h needs this */ #include <X11/CoreP.h> /* Numerous places access the fields of @@ -49,13 +55,9 @@ use XtGetValues(), but ... */ #include <X11/ShellP.h> -#ifdef HAVE_XIM -#ifdef XIM_MOTIF +#if defined (HAVE_XIM) && defined (XIM_MOTIF) #include <Xm/Xm.h> #endif -#include "lstream.h" -#include "file-coding.h" -#endif #ifdef HAVE_DRAGNDROP #include "dragdrop.h" @@ -1057,7 +1059,7 @@ /* #### Use get_coding_system_for_text_file (Vcomposed_input_coding_system, 0) */ instream = make_coding_input_stream - (XLSTREAM (fb_instream), Qundecided, CODING_DECODE); + (XLSTREAM (fb_instream), Qundecided, CODING_DECODE, 0); istr = XLSTREAM (instream);
--- a/src/event-gtk.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/event-gtk.c Sun Mar 31 08:30:17 2002 +0000 @@ -457,7 +457,7 @@ (Vcomposed_input_coding_system, 0) */ instream = make_coding_input_stream (XLSTREAM (fb_instream), - Qundecided, CODING_DECODE); + Qundecided, CODING_DECODE, 0); istr = XLSTREAM (instream);
--- a/src/event-msw.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/event-msw.c Sun Mar 31 08:30:17 2002 +0000 @@ -39,7 +39,20 @@ #include <config.h> #include "lisp.h" +#include "buffer.h" +#include "device.h" +#include "events.h" +#include "faces.h" +#include "frame.h" +#include "glyphs.h" +#include "lstream.h" +#include "process.h" +#include "redisplay.h" +#include "sysdep.h" +#include "window.h" + #include "console-msw.h" +#include "objects-msw.h" #ifdef HAVE_SCROLLBARS # include "scrollbar-msw.h" @@ -54,18 +67,6 @@ # include "dragdrop.h" #endif -#include "buffer.h" -#include "device.h" -#include "events.h" -#include "faces.h" -#include "frame.h" -#include "lstream.h" -#include "objects-msw.h" -#include "process.h" -#include "redisplay.h" -#include "sysdep.h" -#include "window.h" - #include "sysfile.h" #include "sysproc.h" #include "systime.h" @@ -2514,7 +2515,7 @@ /* VERY CONFUSING! See intl-win32.c. */ lcid = lcid & 0xFFFF; - virtual_key = MapVirtualKeyEx (scan, 1, (HKL) lcid); + virtual_key = qxeMapVirtualKeyEx (scan, 1, (HKL) lcid); if (!vk_only) { if (XEUNICODE_P)
--- a/src/event-stream.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/event-stream.c Sun Mar 31 08:30:17 2002 +0000 @@ -1175,18 +1175,6 @@ return tm->object; } -/* Should never, ever be called. (except by an external debugger) */ -static void -print_timeout (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) -{ - const Lisp_Timeout *t = XTIMEOUT (obj); - char buf[64]; - - sprintf (buf, "#<INTERNAL OBJECT (XEmacs bug?) (timeout) 0x%lx>", - (unsigned long) t); - write_c_string (buf, printcharfun); -} - static const struct lrecord_description timeout_description[] = { { XD_LISP_OBJECT, offsetof (Lisp_Timeout, function) }, { XD_LISP_OBJECT, offsetof (Lisp_Timeout, object) }, @@ -1194,7 +1182,7 @@ }; DEFINE_LRECORD_IMPLEMENTATION ("timeout", timeout, - mark_timeout, print_timeout, + mark_timeout, internal_object_printer, 0, 0, 0, timeout_description, Lisp_Timeout); /* Generate a timeout and return its ID. */ @@ -4620,7 +4608,7 @@ Vdribble_file = make_coding_output_stream (XLSTREAM (Vdribble_file), - Qescape_quoted, CODING_ENCODE); + Qescape_quoted, CODING_ENCODE, 0); #endif } return Qnil;
--- a/src/events.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/events.c Sun Mar 31 08:30:17 2002 +0000 @@ -28,7 +28,6 @@ #include "lisp.h" #include "buffer.h" #include "console.h" -#include "console-tty.h" /* for stuff in character_to_event */ #include "device.h" #include "extents.h" #include "events.h" @@ -37,8 +36,11 @@ #include "keymap.h" /* for key_desc_list_to_event() */ #include "lstream.h" #include "redisplay.h" +#include "toolbar.h" #include "window.h" +#include "console-tty.h" /* for stuff in character_to_event */ + /* Where old events go when they are explicitly deallocated. The event chain here is cut loose before GC, so these will be freed eventually. @@ -175,29 +177,21 @@ break; } case process_event: - write_c_string ("#<process-event ", printcharfun); - print_internal (XEVENT (obj)->event.process.process, printcharfun, 1); + write_fmt_string_lisp (printcharfun, "#<process-event %S", 1, XEVENT (obj)->event.process.process); break; case timeout_event: - write_c_string ("#<timeout-event ", printcharfun); - print_internal (XEVENT (obj)->event.timeout.object, printcharfun, 1); + write_fmt_string_lisp (printcharfun, "#<timeout-event %S", 1, XEVENT (obj)->event.timeout.object); break; case empty_event: write_c_string ("#<empty-event", printcharfun); break; case misc_user_event: - write_c_string ("#<misc-user-event (", printcharfun); - print_internal (XEVENT (obj)->event.misc.function, printcharfun, 1); - write_c_string (" ", printcharfun); - print_internal (XEVENT (obj)->event.misc.object, printcharfun, 1); - write_c_string (")", printcharfun); + write_fmt_string_lisp (printcharfun, "#<misc-user-event (%S", 1, XEVENT (obj)->event.misc.function); + write_fmt_string_lisp (printcharfun, " %S)", 1, XEVENT (obj)->event.misc.object); break; case eval_event: - write_c_string ("#<eval-event (", printcharfun); - print_internal (XEVENT (obj)->event.eval.function, printcharfun, 1); - write_c_string (" ", printcharfun); - print_internal (XEVENT (obj)->event.eval.object, printcharfun, 1); - write_c_string (")", printcharfun); + write_fmt_string_lisp (printcharfun, "#<eval-event (%S", 1, XEVENT (obj)->event.eval.function); + write_fmt_string_lisp (printcharfun, " %S)", 1, XEVENT (obj)->event.eval.object); break; case dead_event: write_c_string ("#<DEALLOCATED-EVENT", printcharfun); @@ -930,11 +924,11 @@ if (NILP (pointer)) return Qnil; assert (!NILP (old_chain)); -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_STRUCTURES /* make sure we're actually in the chain */ event_chain_find_previous (old_chain, pointer); assert (event_chain_count (old_chain) == event_chain_count (new_chain)); -#endif /* ERROR_CHECK_TYPECHECK */ +#endif /* ERROR_CHECK_STRUCTURES */ return event_chain_nth (new_chain, event_chain_count (old_chain) - event_chain_count (pointer));
--- a/src/extents.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/extents.c Sun Mar 31 08:30:17 2002 +0000 @@ -2978,12 +2978,10 @@ { Lisp_Object v = XCAR (XCDR (tail)); if (NILP (v)) continue; - print_internal (XCAR (tail), printcharfun, escapeflag); - write_c_string (" ", printcharfun); + write_fmt_string_lisp (printcharfun, "%S ", 1, XCAR (tail)); } - sprintf (buf, "0x%lx", (long) ext); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "0x%lx", (long) ext); } static void @@ -3037,14 +3035,11 @@ write_c_string ("#<destroyed extent", printcharfun); else { - char *buf = (char *) - alloca (strlen (title) + strlen (name) + strlen (posttitle) + 1); write_c_string ("#<extent ", printcharfun); print_extent_1 (obj, printcharfun, escapeflag); write_c_string (extent_detached_p (XEXTENT (obj)) ? " from " : " in ", printcharfun); - sprintf (buf, "%s%s%s", title, name, posttitle); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "%s%s%s", title, name, posttitle); } } else
--- a/src/faces.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/faces.c Sun Mar 31 08:30:17 2002 +0000 @@ -103,19 +103,13 @@ if (print_readably) { - write_c_string ("#s(face name ", printcharfun); - print_internal (face->name, printcharfun, 1); - write_c_string (")", printcharfun); + write_fmt_string_lisp (printcharfun, "#s(face name %S)", 1, face->name); } else { - write_c_string ("#<face ", printcharfun); - print_internal (face->name, printcharfun, 1); + write_fmt_string_lisp (printcharfun, "#<face %S", 1, face->name); if (!NILP (face->doc_string)) - { - write_c_string (" ", printcharfun); - print_internal (face->doc_string, printcharfun, 1); - } + write_fmt_string_lisp (printcharfun, " %S", 1, face->doc_string); write_c_string (">", printcharfun); } }
--- a/src/file-coding.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/file-coding.c Sun Mar 31 08:30:17 2002 +0000 @@ -560,8 +560,7 @@ print_coding_system_in_print_method (Lisp_Object cs, Lisp_Object printcharfun, int escapeflag) { - print_internal (XCODING_SYSTEM_NAME (cs), printcharfun, 0); - write_c_string ("[", printcharfun); + write_fmt_string_lisp (printcharfun, "%s[", 1, XCODING_SYSTEM_NAME (cs)); print_coding_system_properties (cs, printcharfun); write_c_string ("]", printcharfun); } @@ -2209,7 +2208,10 @@ str->convert_from = 0; } - return Lstream_close (str->other_end); + if (str->no_close_other) + return Lstream_flush (str->other_end); + else + return Lstream_close (str->other_end); } static void @@ -2302,7 +2304,8 @@ static Lisp_Object make_coding_stream_1 (Lstream *stream, Lisp_Object codesys, - const char *mode, enum encode_decode direction) + const char *mode, enum encode_decode direction, + int no_close_other) { Lstream *lstr = Lstream_new (lstream_coding, mode); struct coding_stream *str = CODING_STREAM_DATA (lstr); @@ -2316,22 +2319,29 @@ str->convert_to = Dynarr_new (unsigned_char); str->convert_from = Dynarr_new (unsigned_char); str->direction = direction; + str->no_close_other = no_close_other; set_coding_stream_coding_system (lstr, codesys); return wrap_lstream (lstr); } +/* If NO_CLOSE_OTHER is non-zero, don't close STREAM (the stream at the + other end) when this stream is closed. */ Lisp_Object make_coding_input_stream (Lstream *stream, Lisp_Object codesys, - enum encode_decode direction) + enum encode_decode direction, int no_close_other) { - return make_coding_stream_1 (stream, codesys, "r", direction); + return make_coding_stream_1 (stream, codesys, "r", direction, + no_close_other); } +/* If NO_CLOSE_OTHER is non-zero, don't close STREAM (the stream at the + other end) when this stream is closed. */ Lisp_Object make_coding_output_stream (Lstream *stream, Lisp_Object codesys, - enum encode_decode direction) + enum encode_decode direction, int no_close_other) { - return make_coding_stream_1 (stream, codesys, "w", direction); + return make_coding_stream_1 (stream, codesys, "w", direction, + no_close_other); } static Lisp_Object @@ -2372,18 +2382,19 @@ XCODING_SYSTEM_EOL_TYPE (coding_system) == EOL_AUTODETECT) next = auto_outstream = make_coding_output_stream - (XLSTREAM (next), Fget_coding_system (Qconvert_eol_autodetect), CODING_DECODE); + (XLSTREAM (next), Fget_coding_system (Qconvert_eol_autodetect), + CODING_DECODE, 0); if (!sink_char) next = from_outstream = - make_coding_output_stream (XLSTREAM (next), Qbinary, CODING_DECODE); + make_coding_output_stream (XLSTREAM (next), Qbinary, CODING_DECODE, 0); outstream = make_coding_output_stream (XLSTREAM (next), coding_system, - direction); + direction, 0); if (!source_char) { to_outstream = make_coding_output_stream (XLSTREAM (outstream), - Qbinary, CODING_ENCODE); + Qbinary, CODING_ENCODE, 0); ostr = XLSTREAM (to_outstream); } else @@ -2691,7 +2702,7 @@ make_coding_output_stream (XLSTREAM (lstream_out), codesys[direction == CODING_ENCODE ? ncodesys - (i + 1) : i], - direction); + direction, 0); lstream_out = data->lstreams[i]; Lstream_set_buffering (XLSTREAM (lstream_out), LSTREAM_UNBUFFERED, 0); @@ -3904,7 +3915,7 @@ make_coding_output_stream (XLSTREAM (data->c.lstreams[data->c.lstream_count - 1]), Fget_coding_system (Qconvert_eol_autodetect), - CODING_DECODE); + CODING_DECODE, 0); Lstream_set_buffering (XLSTREAM (data->c.lstreams[1]), LSTREAM_UNBUFFERED, 0); @@ -3915,7 +3926,7 @@ (XLSTREAM (data->c.lstreams[1]), /* Substitute binary if we need to detect the encoding */ csdata->do_coding ? Qbinary : csdata->cs, - CODING_DECODE); + CODING_DECODE, 0); Lstream_set_buffering (XLSTREAM (data->c.lstreams[0]), LSTREAM_UNBUFFERED, 0); @@ -4124,6 +4135,9 @@ return Qnil; } +/* Detect the encoding of STREAM. Assumes stream is at the begnning and will + read through to the end of STREAM, leaving it there but open. */ + Lisp_Object detect_coding_stream (Lisp_Object stream) { @@ -4133,11 +4147,11 @@ Lisp_Object binary_instream = make_coding_input_stream (XLSTREAM (stream), Qbinary, - CODING_ENCODE); + CODING_ENCODE, 1); Lisp_Object decstream = make_coding_input_stream (XLSTREAM (binary_instream), - Qundecided, CODING_DECODE); + Qundecided, CODING_DECODE, 0); Lstream *decstr = XLSTREAM (decstream); GCPRO3 (decstream, stream, binary_instream);
--- a/src/file-coding.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/file-coding.h Sun Mar 31 08:30:17 2002 +0000 @@ -448,7 +448,7 @@ #define coding_system_data_offset (offsetof (Lisp_Coding_System, data)) extern const struct lrecord_description coding_system_empty_extra_description[]; -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES #define DECLARE_CODING_SYSTEM_TYPE(type) \ \ extern struct coding_system_methods * type##_coding_system_methods; \ @@ -487,7 +487,7 @@ #else #define DECLARE_CODING_SYSTEM_TYPE(type) \ extern struct coding_system_methods * type##_coding_system_methods -#endif /* ERROR_CHECK_TYPECHECK */ +#endif /* ERROR_CHECK_TYPES */ #define DEFINE_CODING_SYSTEM_TYPE(type) \ struct coding_system_methods * type##_coding_system_methods @@ -544,7 +544,7 @@ #define XCODING_SYSTEM_TYPE_P(cs, type) \ CODING_SYSTEM_TYPE_P (XCODING_SYSTEM (cs), type) -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES # define CODING_SYSTEM_TYPE_DATA(cs, type) \ error_check_##type##_coding_system_data (cs) #else @@ -556,7 +556,7 @@ #define XCODING_SYSTEM_TYPE_DATA(cs, type) \ CODING_SYSTEM_TYPE_DATA (XCODING_SYSTEM_OF_TYPE (cs, type), type) -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES # define XCODING_SYSTEM_OF_TYPE(x, type) \ error_check_##type##_coding_system_type (x) # define XSETCODING_SYSTEM_OF_TYPE(x, p, type) do \ @@ -917,7 +917,7 @@ /* Coding-system-specific data holding extra state about the conversion. Logically a struct TYPE_coding_stream; a pointer - to such a struct, with (when ERROR_CHECK_TYPECHECK is defined) + to such a struct, with (when ERROR_CHECK_TYPES is defined) error-checking that this is really a structure of that type (checking the corresponding coding system type) can be retrieved using CODING_STREAM_TYPE_DATA(). Allocated at the same time that @@ -928,13 +928,16 @@ enum encode_decode direction; + /* If set, don't close the stream at the other end when being closed. */ + unsigned int no_close_other:1; + /* #### Temporary test */ unsigned int finalized:1; }; #define CODING_STREAM_DATA(stream) LSTREAM_TYPE_DATA (stream, coding) -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES # define CODING_STREAM_TYPE_DATA(s, type) \ error_check_##type##_coding_stream_data (s) #else @@ -1055,9 +1058,11 @@ Lisp_Object description, Lisp_Object props); Lisp_Object make_coding_input_stream (Lstream *stream, Lisp_Object codesys, - enum encode_decode direction); + enum encode_decode direction, + int no_close_other); Lisp_Object make_coding_output_stream (Lstream *stream, Lisp_Object codesys, - enum encode_decode direction); + enum encode_decode direction, + int no_close_other); void set_detection_results (struct detection_state *st, int detector, int given);
--- a/src/fileio.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/fileio.c Sun Mar 31 08:30:17 2002 +0000 @@ -31,14 +31,15 @@ #include "lisp.h" #include "buffer.h" +#include "device.h" #include "events.h" +#include "file-coding.h" #include "frame.h" #include "insdel.h" #include "lstream.h" #include "redisplay.h" #include "sysdep.h" #include "window.h" /* minibuf_level */ -#include "file-coding.h" #include "sysfile.h" #include "sysproc.h" @@ -3007,7 +3008,7 @@ Lstream_set_buffering (XLSTREAM (stream), LSTREAM_BLOCKN_BUFFERED, 65536); stream = make_coding_input_stream (XLSTREAM (stream), get_coding_system_for_text_file (codesys, 1), - CODING_DECODE); + CODING_DECODE, 0); Lstream_set_character_mode (XLSTREAM (stream)); Lstream_set_buffering (XLSTREAM (stream), LSTREAM_BLOCKN_BUFFERED, 65536); @@ -3337,7 +3338,8 @@ Lstream_set_buffering (XLSTREAM (outstream), LSTREAM_BLOCKN_BUFFERED, 65536); outstream = - make_coding_output_stream (XLSTREAM (outstream), codesys, CODING_ENCODE); + make_coding_output_stream (XLSTREAM (outstream), codesys, + CODING_ENCODE, 0); Lstream_set_buffering (XLSTREAM (outstream), LSTREAM_BLOCKN_BUFFERED, 65536); if (STRINGP (start))
--- a/src/frame-msw.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/frame-msw.c Sun Mar 31 08:30:17 2002 +0000 @@ -35,9 +35,7 @@ #include "lisp.h" #include "buffer.h" -#include "elhash.h" -#include "console-msw.h" -#include "glyphs-msw.h" +#include "device.h" #include "elhash.h" #include "events.h" #include "faces.h" @@ -45,6 +43,9 @@ #include "redisplay.h" #include "window.h" +#include "console-msw.h" +#include "glyphs-msw.h" + #define MSWINDOWS_FRAME_STYLE (WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW) #define MSWINDOWS_POPUP_STYLE (WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_POPUP \ | WS_CAPTION | WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX)
--- a/src/frame-tty.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/frame-tty.c Sun Mar 31 08:30:17 2002 +0000 @@ -27,10 +27,11 @@ #include <config.h> #include "lisp.h" -#include "console-tty.h" +#include "device.h" +#include "events.h" #include "frame.h" -#include "events.h" +#include "console-tty.h" /* Default properties to use when creating frames. */
--- a/src/frame-x.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/frame-x.c Sun Mar 31 08:30:17 2002 +0000 @@ -28,7 +28,20 @@ #include <config.h> #include "lisp.h" +#include "buffer.h" +#include "device.h" +#include "events.h" +#include "extents.h" +#include "faces.h" +#include "frame.h" +#include "window.h" +#include "gutter.h" + #include "console-x.h" +#include "glyphs-x.h" +#include "objects-x.h" +#include "scrollbar-x.h" + #include "xintrinsicp.h" /* CoreP.h needs this */ #include <X11/CoreP.h> /* Numerous places access the fields of a core widget directly. We could @@ -42,17 +55,6 @@ #ifdef EXTERNAL_WIDGET #include "ExternalShell.h" #endif -#include "glyphs-x.h" -#include "objects-x.h" -#include "scrollbar-x.h" - -#include "buffer.h" -#include "events.h" -#include "extents.h" -#include "faces.h" -#include "frame.h" -#include "window.h" -#include "gutter.h" #ifdef HAVE_DRAGNDROP #include "dragdrop.h"
--- a/src/frame.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/frame.c Sun Mar 31 08:30:17 2002 +0000 @@ -29,6 +29,7 @@ #include "buffer.h" /* for Vbuffer_alist */ #include "console.h" +#include "device.h" #include "events.h" #include "extents.h" #include "faces.h" @@ -38,6 +39,7 @@ #include "menubar.h" #include "redisplay.h" #include "scrollbar.h" +#include "toolbar.h" #include "window.h" Lisp_Object Vselect_frame_hook, Qselect_frame_hook; @@ -149,18 +151,15 @@ print_frame (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { struct frame *frm = XFRAME (obj); - char buf[200]; if (print_readably) printing_unreadable_object ("#<frame %s 0x%x>", XSTRING_DATA (frm->name), frm->header.uid); - sprintf (buf, "#<%s-frame ", !FRAME_LIVE_P (frm) ? "dead" : - FRAME_TYPE_NAME (frm)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "#<%s-frame ", !FRAME_LIVE_P (frm) ? "dead" : + FRAME_TYPE_NAME (frm)); print_internal (frm->name, printcharfun, 1); - sprintf (buf, " 0x%x>", frm->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " 0x%x>", frm->header.uid); } DEFINE_LRECORD_IMPLEMENTATION ("frame", frame,
--- a/src/frame.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/frame.h Sun Mar 31 08:30:17 2002 +0000 @@ -23,17 +23,8 @@ #ifndef INCLUDED_frame_h_ #define INCLUDED_frame_h_ -#ifdef HAVE_SCROLLBARS -#include "scrollbar.h" -#endif - -#ifdef HAVE_TOOLBARS -#include "toolbar.h" -#endif - -#include "device.h" -#include "glyphs.h" #include "redisplay.h" +#include "console.h" /* for error_check_frame_type */ #define FRAME_TYPE_NAME(f) ((f)->framemeths->name) #define FRAME_TYPE(f) ((f)->framemeths->symbol) @@ -254,7 +245,7 @@ #define FRAME_TYPE_P(f, type) EQ (FRAME_TYPE (f), Q##type) -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES INLINE_HEADER struct frame * error_check_frame_type (struct frame * f, Lisp_Object sym); INLINE_HEADER struct frame *
--- a/src/glyphs-gtk.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/glyphs-gtk.c Sun Mar 31 08:30:17 2002 +0000 @@ -2,7 +2,7 @@ Copyright (C) 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995 Tinker Systems - Copyright (C) 1995, 1996, 2001 Ben Wing + Copyright (C) 1995, 1996, 2001, 2002 Ben Wing Copyright (C) 1995 Sun Microsystems This file is part of XEmacs. @@ -354,20 +354,16 @@ Lisp_Object printcharfun, int escapeflag) { - char buf[100]; - switch (IMAGE_INSTANCE_TYPE (p)) { case IMAGE_MONO_PIXMAP: case IMAGE_COLOR_PIXMAP: case IMAGE_POINTER: - sprintf (buf, " (0x%lx", (unsigned long) IMAGE_INSTANCE_GTK_PIXMAP (p)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " (0x%lx", + (unsigned long) IMAGE_INSTANCE_GTK_PIXMAP (p)); if (IMAGE_INSTANCE_GTK_MASK (p)) - { - sprintf (buf, "/0x%lx", (unsigned long) IMAGE_INSTANCE_GTK_MASK (p)); - write_c_string (buf, printcharfun); - } + write_fmt_string (printcharfun, "/0x%lx", + (unsigned long) IMAGE_INSTANCE_GTK_MASK (p)); write_c_string (")", printcharfun); break; #if HAVE_SUBWINDOWS @@ -1126,7 +1122,7 @@ ostr = XLSTREAM (outstream); /* setup the conversion stream */ conv_out_stream = - make_coding_output_stream (ostr, Qbinary, CODING_ENCODE); + make_coding_output_stream (ostr, Qbinary, CODING_ENCODE, 0); costr = XLSTREAM (conv_out_stream); GCPRO4 (tempfile, instream, outstream, conv_out_stream);
--- a/src/glyphs-msw.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/glyphs-msw.c Sun Mar 31 08:30:17 2002 +0000 @@ -30,24 +30,25 @@ #include <config.h> #include "lisp.h" + +#include "device.h" +#include "elhash.h" +#include "faces.h" +#include "file-coding.h" +#include "frame.h" +#include "gui.h" +#include "imgproc.h" +#include "insdel.h" #include "lstream.h" +#include "opaque.h" +#include "sysdep.h" +#include "sysfile.h" +#include "window.h" #include "console-msw.h" #include "glyphs-msw.h" #include "objects-msw.h" -#include "window.h" -#include "elhash.h" -#include "buffer.h" -#include "frame.h" -#include "insdel.h" -#include "opaque.h" -#include "sysdep.h" -#include "sysfile.h" -#include "faces.h" -#include "imgproc.h" -#include "file-coding.h" - #define WIDGET_GLYPH_SLOT 0 DECLARE_IMAGE_INSTANTIATOR_FORMAT (nothing); @@ -1703,21 +1704,17 @@ Lisp_Object printcharfun, int escapeflag) { - char buf[100]; - switch (IMAGE_INSTANCE_TYPE (p)) { case IMAGE_MONO_PIXMAP: case IMAGE_COLOR_PIXMAP: case IMAGE_POINTER: - sprintf (buf, " (0x%lx", - (unsigned long) IMAGE_INSTANCE_MSWINDOWS_BITMAP (p)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " (0x%lx", + (unsigned long) IMAGE_INSTANCE_MSWINDOWS_BITMAP (p)); if (IMAGE_INSTANCE_MSWINDOWS_MASK (p)) { - sprintf (buf, "/0x%lx", - (unsigned long) IMAGE_INSTANCE_MSWINDOWS_MASK (p)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "/0x%lx", + (unsigned long) IMAGE_INSTANCE_MSWINDOWS_MASK (p)); } write_c_string (")", printcharfun); break; @@ -2860,9 +2857,6 @@ if (IMAGE_INSTANCE_WIDGET_ITEMS_CHANGED (ii)) { Lisp_Object val; -#ifdef ERROR_CHECK_GLYPHS - assert (GUI_ITEMP (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (ii))); -#endif val = XGUI_ITEM (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (ii))->value; #ifdef DEBUG_WIDGET_OUTPUT stderr_out ("progress gauge displayed value on %p updated to %ld\n",
--- a/src/glyphs-shared.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/glyphs-shared.c Sun Mar 31 08:30:17 2002 +0000 @@ -31,18 +31,20 @@ #include <config.h> #include "lisp.h" -#include "lstream.h" -#include "window.h" +#include "buffer.h" #include "elhash.h" -#include "buffer.h" +#include "faces.h" #include "frame.h" +#include "glyphs.h" +#include "imgproc.h" #include "insdel.h" +#include "lstream.h" #include "opaque.h" #include "sysdep.h" +#include "window.h" + #include "sysfile.h" -#include "faces.h" -#include "imgproc.h" Lisp_Object Q_resource_type, Q_resource_id;
--- a/src/glyphs-widget.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/glyphs-widget.c Sun Mar 31 08:30:17 2002 +0000 @@ -24,18 +24,19 @@ #include <config.h> #include "lisp.h" -#include "lstream.h" + +#include "bytecode.h" #include "console.h" #include "device.h" #include "faces.h" +#include "frame.h" #include "glyphs.h" +#include "gui.h" +#include "insdel.h" +#include "lstream.h" #include "objects.h" -#include "bytecode.h" +#include "opaque.h" #include "window.h" -#include "buffer.h" -#include "frame.h" -#include "insdel.h" -#include "opaque.h" DEFINE_IMAGE_INSTANTIATOR_FORMAT (button); DEFINE_IMAGE_INSTANTIATOR_FORMAT (combo_box);
--- a/src/glyphs-x.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/glyphs-x.c Sun Mar 31 08:30:17 2002 +0000 @@ -53,7 +53,19 @@ #include <config.h> #include "lisp.h" + +#include "buffer.h" +#include "device.h" +#include "faces.h" +#include "file-coding.h" +#include "frame.h" +#include "gui.h" +#include "imgproc.h" +#include "insdel.h" #include "lstream.h" +#include "opaque.h" +#include "window.h" + #include "console-x.h" #include "glyphs-x.h" #include "objects-x.h" @@ -62,23 +74,11 @@ #endif #include "xmu.h" -#include "buffer.h" -#include "window.h" -#include "frame.h" -#include "insdel.h" -#include "opaque.h" -#include "gui.h" -#include "faces.h" - -#include "imgproc.h" - #include "sysfile.h" #include "sysproc.h" /* for qxe_getpid() */ #include <setjmp.h> -#include "file-coding.h" - #ifdef LWLIB_WIDGETS_MOTIF #include <Xm/Xm.h> #include <Xm/Scale.h> @@ -369,19 +369,17 @@ Lisp_Object printcharfun, int escapeflag) { - char buf[100]; - switch (IMAGE_INSTANCE_TYPE (p)) { case IMAGE_MONO_PIXMAP: case IMAGE_COLOR_PIXMAP: case IMAGE_POINTER: - sprintf (buf, " (0x%lx", (unsigned long) IMAGE_INSTANCE_X_PIXMAP (p)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " (0x%lx", + (unsigned long) IMAGE_INSTANCE_X_PIXMAP (p)); if (IMAGE_INSTANCE_X_MASK (p)) { - sprintf (buf, "/0x%lx", (unsigned long) IMAGE_INSTANCE_X_MASK (p)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "/0x%lx", + (unsigned long) IMAGE_INSTANCE_X_MASK (p)); } write_c_string (")", printcharfun); break; @@ -2594,9 +2592,6 @@ { Arg al [1]; Lisp_Object val; -#ifdef ERROR_CHECK_GLYPHS - assert (GUI_ITEMP (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (p))); -#endif val = XGUI_ITEM (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (p))->value; XtSetArg (al[0], XtNvalue, XINT (val)); XtSetValues (IMAGE_INSTANCE_X_WIDGET_ID (p), al, 1);
--- a/src/glyphs.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/glyphs.c Sun Mar 31 08:30:17 2002 +0000 @@ -38,6 +38,7 @@ #include "faces.h" #include "frame.h" #include "glyphs.h" +#include "gui.h" #include "insdel.h" #include "objects.h" #include "opaque.h" @@ -903,23 +904,16 @@ print_image_instance (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { - char buf[100]; Lisp_Image_Instance *ii = XIMAGE_INSTANCE (obj); if (print_readably) printing_unreadable_object ("#<image-instance 0x%x>", ii->header.uid); - write_c_string ("#<image-instance (", printcharfun); - print_internal (Fimage_instance_type (obj), printcharfun, 0); - write_c_string (") ", printcharfun); + write_fmt_string_lisp (printcharfun, "#<image-instance (%s) ", 1, + Fimage_instance_type (obj)); if (!NILP (ii->name)) - { - print_internal (ii->name, printcharfun, 1); - write_c_string (" ", printcharfun); - } - write_c_string ("on ", printcharfun); - print_internal (ii->domain, printcharfun, 0); - write_c_string (" ", printcharfun); + write_fmt_string_lisp (printcharfun, "%S ", 1, ii->name); + write_fmt_string_lisp (printcharfun, "on %s ", 1, ii->domain); switch (IMAGE_INSTANCE_TYPE (ii)) { case IMAGE_NOTHING: @@ -943,30 +937,27 @@ print_internal (filename, printcharfun, 1); } if (IMAGE_INSTANCE_PIXMAP_DEPTH (ii) > 1) - sprintf (buf, " %dx%dx%d", IMAGE_INSTANCE_PIXMAP_WIDTH (ii), - IMAGE_INSTANCE_PIXMAP_HEIGHT (ii), - IMAGE_INSTANCE_PIXMAP_DEPTH (ii)); + write_fmt_string (printcharfun, " %dx%dx%d", + IMAGE_INSTANCE_PIXMAP_WIDTH (ii), + IMAGE_INSTANCE_PIXMAP_HEIGHT (ii), + IMAGE_INSTANCE_PIXMAP_DEPTH (ii)); else - sprintf (buf, " %dx%d", IMAGE_INSTANCE_PIXMAP_WIDTH (ii), - IMAGE_INSTANCE_PIXMAP_HEIGHT (ii)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " %dx%d", + IMAGE_INSTANCE_PIXMAP_WIDTH (ii), + IMAGE_INSTANCE_PIXMAP_HEIGHT (ii)); if (!NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)) || !NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii))) { write_c_string (" @", printcharfun); if (!NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii))) - { - long_to_string (buf, XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii))); - write_c_string (buf, printcharfun); - } + write_fmt_string (printcharfun, "%ld", + XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii))); else write_c_string ("??", printcharfun); write_c_string (",", printcharfun); if (!NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii))) - { - long_to_string (buf, XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii))); - write_c_string (buf, printcharfun); - } + write_fmt_string (printcharfun, "%ld", + XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii))); else write_c_string ("??", printcharfun); } @@ -995,23 +986,17 @@ print_internal (IMAGE_INSTANCE_WIDGET_TYPE (ii), printcharfun, 0); if (GUI_ITEMP (IMAGE_INSTANCE_WIDGET_ITEM (ii))) - { - write_c_string (" ", printcharfun); - print_internal (IMAGE_INSTANCE_WIDGET_TEXT (ii), printcharfun, 1); - } + write_fmt_string_lisp (printcharfun, " %S", 1, + IMAGE_INSTANCE_WIDGET_TEXT (ii)); if (!NILP (IMAGE_INSTANCE_WIDGET_FACE (ii))) - { - write_c_string (" face=", printcharfun); - print_internal - (IMAGE_INSTANCE_WIDGET_FACE (ii), printcharfun, 0); - } + write_fmt_string_lisp (printcharfun, " face=%s", 1, + IMAGE_INSTANCE_WIDGET_FACE (ii)); /* fallthrough */ case IMAGE_SUBWINDOW: - sprintf (buf, " %dx%d", IMAGE_INSTANCE_WIDTH (ii), - IMAGE_INSTANCE_HEIGHT (ii)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " %dx%d", IMAGE_INSTANCE_WIDTH (ii), + IMAGE_INSTANCE_HEIGHT (ii)); /* This is stolen from frame.c. Subwindows are strange in that they are specific to a particular frame so we want to print in their @@ -1028,8 +1013,8 @@ printcharfun); } write_c_string ("-frame>", printcharfun); - sprintf (buf, " 0x%p", IMAGE_INSTANCE_SUBWINDOW_ID (ii)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " 0x%p", + IMAGE_INSTANCE_SUBWINDOW_ID (ii)); break; @@ -1039,8 +1024,7 @@ MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain), print_image_instance, (ii, printcharfun, escapeflag)); - sprintf (buf, " 0x%x>", ii->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " 0x%x>", ii->header.uid); } static void @@ -3576,17 +3560,13 @@ print_glyph (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { Lisp_Glyph *glyph = XGLYPH (obj); - char buf[20]; if (print_readably) printing_unreadable_object ("#<glyph 0x%x>", glyph->header.uid); - write_c_string ("#<glyph (", printcharfun); - print_internal (Fglyph_type (obj), printcharfun, 0); - write_c_string (") ", printcharfun); - print_internal (glyph->image, printcharfun, 1); - sprintf (buf, "0x%x>", glyph->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string_lisp (printcharfun, "#<glyph (%s", 1, Fglyph_type (obj)); + write_fmt_string_lisp (printcharfun, ") %S", 1, glyph->image); + write_fmt_string (printcharfun, "0x%x>", glyph->header.uid); } /* Glyphs are equal if all of their display attributes are equal. We
--- a/src/glyphs.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/glyphs.h Sun Mar 31 08:30:17 2002 +0000 @@ -1,4 +1,4 @@ -/* Generic glyph data structures + display tables + /* Generic glyph data structures + display tables Copyright (C) 1994 Board of Trustees, University of Illinois. Copyright (C) 1995, 1996 Ben Wing @@ -25,7 +25,7 @@ #define INCLUDED_glyphs_h_ #include "specifier.h" -#include "gui.h" +#include "window.h" /* need for GLYPH_CACHEL_WIDTH */ /************************************************************************/ /* Image Instantiators */ @@ -1059,8 +1059,6 @@ #ifdef ERROR_CHECK_GLYPHS -#include "window.h" - INLINE_HEADER int GLYPH_CACHEL_WIDTH (struct window *window, int ind); INLINE_HEADER int @@ -1091,7 +1089,7 @@ #else /* not ERROR_CHECK_GLYPHS */ -#define GLYPH_CACHEL_WIDTH(window, ind) \ +#define GLYPH_CACHEL_WIDTH(window, ind) \ Dynarr_atp (window->glyph_cachels, ind)->width #define GLYPH_CACHEL_ASCENT(window, ind) \ Dynarr_atp (window->glyph_cachels, ind)->ascent @@ -1102,7 +1100,7 @@ #define GLYPH_CACHEL(window, ind) \ Dynarr_atp (window->glyph_cachels, ind) -#define GLYPH_CACHEL_GLYPH(window, ind) \ +#define GLYPH_CACHEL_GLYPH(window, ind) \ Dynarr_atp (window->glyph_cachels, ind)->glyph #define GLYPH_CACHEL_DIRTYP(window, ind) \ Dynarr_atp (window->glyph_cachels, ind)->dirty
--- a/src/insdel.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/insdel.c Sun Mar 31 08:30:17 2002 +0000 @@ -994,7 +994,7 @@ else *len = XSTRING_LENGTH (reloc) - offset; } -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT assert (*len >= 0); if (STRINGP (reloc)) { @@ -1207,9 +1207,6 @@ int flags) { /* This function can GC */ -#ifdef ERROR_CHECK_TYPECHECK - assert (STRINGP (str)); -#endif return buffer_insert_string_1 (buf, pos, 0, str, 0, XSTRING_LENGTH (str), flags);
--- a/src/intl-auto-encap-win32.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/intl-auto-encap-win32.c Sun Mar 31 08:30:17 2002 +0000 @@ -60,6 +60,8 @@ /* Error if GetStringTypeEx used: not used, not examined yet */ +/* Error if GetStringType used: no such fun; A and W versions have different nos. of args */ + /* Error if FoldString used: not used, not examined yet */ /* Error if EnumSystemLocales used: not used, not examined yet */ @@ -2585,15 +2587,6 @@ return GetLongPathNameA ((LPCSTR) lpszShortPath, (LPSTR) lpszLongPath, cchBuffer); } -Extbyte * -qxeGetEnvironmentStrings (void) -{ - if (XEUNICODE_P) - return (Extbyte *) GetEnvironmentStringsW (); - else - return (Extbyte *) GetEnvironmentStringsA (); -} - BOOL qxeFreeEnvironmentStrings (Extbyte * arg1) {
--- a/src/intl-auto-encap-win32.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/intl-auto-encap-win32.h Sun Mar 31 08:30:17 2002 +0000 @@ -7,946 +7,2919 @@ #undef GetCPInfoEx #define GetCPInfoEx error not used, not examined yet + #undef CompareString #define CompareString error not used, not examined yet + #undef LCMapString #define LCMapString error not used, not examined yet + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetLocaleInfo +#define GetLocaleInfo error use qxeGetLocaleInfo or GetLocaleInfoA/GetLocaleInfoW +#endif int qxeGetLocaleInfo (LCID Locale, LCTYPE LCType, Extbyte * lpLCData, int cchData); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetLocaleInfo +#define SetLocaleInfo error use qxeSetLocaleInfo or SetLocaleInfoA/SetLocaleInfoW +#endif BOOL qxeSetLocaleInfo (LCID Locale, LCTYPE LCType, const Extbyte * lpLCData); + #undef GetTimeFormat #define GetTimeFormat error not used, not examined yet + #undef GetDateFormat #define GetDateFormat error not used, not examined yet + #undef GetNumberFormat #define GetNumberFormat error not used, not examined yet + #undef GetCurrencyFormat #define GetCurrencyFormat error not used, not examined yet + #undef EnumCalendarInfo #define EnumCalendarInfo error not used, not examined yet + #undef EnumCalendarInfoEx #define EnumCalendarInfoEx error not used, not examined yet + #undef EnumTimeFormats #define EnumTimeFormats error not used, not examined yet + #undef EnumDateFormats #define EnumDateFormats error not used, not examined yet + #undef EnumDateFormatsEx #define EnumDateFormatsEx error not used, not examined yet + #undef GetStringTypeEx #define GetStringTypeEx error not used, not examined yet + +#undef GetStringType +#define GetStringType error no such fun; A and W versions have different nos. of args + #undef FoldString #define FoldString error not used, not examined yet + #undef EnumSystemLocales #define EnumSystemLocales error not used, not examined yet + #undef EnumSystemCodePages #define EnumSystemCodePages error not used, not examined yet + /* Processing file WINSPOOL.H */ #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef EnumPrinters +#define EnumPrinters error use qxeEnumPrinters or EnumPrintersA/EnumPrintersW +#endif BOOL qxeEnumPrinters (DWORD Flags, Extbyte * Name, DWORD Level, LPBYTE pPrinterEnum, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) /* Skipping OpenPrinter because split-sized DEVMODE pointer in split PRINTER_DEFAULTS */ #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef ResetPrinter #define ResetPrinter error split-sized DEVMODE pointer in split PRINTER_DEFAULTS #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef SetJob #define SetJob error split-sized DEVMODE pointer in split JOB_INFO_2 #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef GetJob #define GetJob error split-sized DEVMODE pointer in split JOB_INFO_2 #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef EnumJobs #define EnumJobs error split-sized DEVMODE pointer in split JOB_INFO_2 #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef AddPrinter #define AddPrinter error split-sized DEVMODE pointer in split PRINTER_INFO_2 #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef SetPrinter #define SetPrinter error split-sized DEVMODE pointer in split PRINTER_INFO_2 #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef GetPrinter #define GetPrinter error split-sized DEVMODE pointer in split PRINTER_INFO_2 #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef AddPrinterDriver #define AddPrinterDriver error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef AddPrinterDriverEx #define AddPrinterDriverEx error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef EnumPrinterDrivers #define EnumPrinterDrivers error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef GetPrinterDriver #define GetPrinterDriver error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef GetPrinterDriverDirectory #define GetPrinterDriverDirectory error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef DeletePrinterDriver #define DeletePrinterDriver error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef DeletePrinterDriverEx #define DeletePrinterDriverEx error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef AddPerMachineConnection #define AddPerMachineConnection error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef DeletePerMachineConnection #define DeletePerMachineConnection error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef EnumPerMachineConnections #define EnumPerMachineConnections error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef AddPrintProcessor #define AddPrintProcessor error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef EnumPrintProcessors #define EnumPrintProcessors error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef GetPrintProcessorDirectory #define GetPrintProcessorDirectory error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef EnumPrintProcessorDatatypes #define EnumPrintProcessorDatatypes error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef DeletePrintProcessor #define DeletePrintProcessor error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef StartDocPrinter #define StartDocPrinter error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef AddJob #define AddJob error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) /* Skipping DocumentProperties because split-sized DEVMODE, error in Cygwin prototype */ #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef AdvancedDocumentProperties #define AdvancedDocumentProperties error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef GetPrinterData #define GetPrinterData error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef GetPrinterDataEx #define GetPrinterDataEx error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef EnumPrinterData #define EnumPrinterData error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef EnumPrinterDataEx #define EnumPrinterDataEx error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef EnumPrinterKey #define EnumPrinterKey error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef SetPrinterData #define SetPrinterData error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef SetPrinterDataEx #define SetPrinterDataEx error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef DeletePrinterData #define DeletePrinterData error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef DeletePrinterDataEx #define DeletePrinterDataEx error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef DeletePrinterKey #define DeletePrinterKey error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef PrinterMessageBox #define PrinterMessageBox error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef AddForm #define AddForm error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef DeleteForm #define DeleteForm error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef GetForm #define GetForm error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef SetForm #define SetForm error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef EnumForms #define EnumForms error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef EnumMonitors #define EnumMonitors error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef AddMonitor #define AddMonitor error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef DeleteMonitor #define DeleteMonitor error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef EnumPorts #define EnumPorts error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef AddPort #define AddPort error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef ConfigurePort #define ConfigurePort error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef DeletePort #define DeletePort error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef XcvData #define XcvData error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef SetPort #define SetPort error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef AddPrinterConnection #define AddPrinterConnection error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef DeletePrinterConnection #define DeletePrinterConnection error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef AddPrintProvidor #define AddPrintProvidor error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef DeletePrintProvidor #define DeletePrintProvidor error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef SetPrinterHTMLView #define SetPrinterHTMLView error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef GetPrinterHTMLView #define GetPrinterHTMLView error not used, complicated interface with split structures #endif /* defined (HAVE_MS_WINDOWS) */ + /* Processing file WINNETWK.H */ #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetAddConnection +#define WNetAddConnection error use qxeWNetAddConnection or WNetAddConnectionA/WNetAddConnectionW +#endif DWORD qxeWNetAddConnection (const Extbyte * lpRemoteName, const Extbyte * lpPassword, const Extbyte * lpLocalName); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetAddConnection2 +#define WNetAddConnection2 error use qxeWNetAddConnection2 or WNetAddConnection2A/WNetAddConnection2W +#endif DWORD qxeWNetAddConnection2 (LPNETRESOURCEW lpNetResource, const Extbyte * lpPassword, const Extbyte * lpUserName, DWORD dwFlags); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetAddConnection3 +#define WNetAddConnection3 error use qxeWNetAddConnection3 or WNetAddConnection3A/WNetAddConnection3W +#endif DWORD qxeWNetAddConnection3 (HWND hwndOwner, LPNETRESOURCEW lpNetResource, const Extbyte * lpPassword, const Extbyte * lpUserName, DWORD dwFlags); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetCancelConnection +#define WNetCancelConnection error use qxeWNetCancelConnection or WNetCancelConnectionA/WNetCancelConnectionW +#endif DWORD qxeWNetCancelConnection (const Extbyte * lpName, BOOL fForce); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetCancelConnection2 +#define WNetCancelConnection2 error use qxeWNetCancelConnection2 or WNetCancelConnection2A/WNetCancelConnection2W +#endif DWORD qxeWNetCancelConnection2 (const Extbyte * lpName, DWORD dwFlags, BOOL fForce); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetGetConnection +#define WNetGetConnection error use qxeWNetGetConnection or WNetGetConnectionA/WNetGetConnectionW +#endif DWORD qxeWNetGetConnection (const Extbyte * lpLocalName, Extbyte * lpRemoteName, LPDWORD lpnLength); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetUseConnection +#define WNetUseConnection error use qxeWNetUseConnection or WNetUseConnectionA/WNetUseConnectionW +#endif DWORD qxeWNetUseConnection (HWND hwndOwner, LPNETRESOURCEW lpNetResource, const Extbyte * lpUserID, const Extbyte * lpPassword, DWORD dwFlags, Extbyte * lpAccessName, LPDWORD lpBufferSize, LPDWORD lpResult); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetConnectionDialog1 +#define WNetConnectionDialog1 error use qxeWNetConnectionDialog1 or WNetConnectionDialog1A/WNetConnectionDialog1W +#endif DWORD qxeWNetConnectionDialog1 (LPCONNECTDLGSTRUCTW lpConnDlgStruct); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetDisconnectDialog1 +#define WNetDisconnectDialog1 error use qxeWNetDisconnectDialog1 or WNetDisconnectDialog1A/WNetDisconnectDialog1W +#endif DWORD qxeWNetDisconnectDialog1 (LPDISCDLGSTRUCTW lpConnDlgStruct); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetOpenEnum +#define WNetOpenEnum error use qxeWNetOpenEnum or WNetOpenEnumA/WNetOpenEnumW +#endif DWORD qxeWNetOpenEnum (DWORD dwScope, DWORD dwType, DWORD dwUsage, LPNETRESOURCEW lpNetResource, LPHANDLE lphEnum); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetEnumResource +#define WNetEnumResource error use qxeWNetEnumResource or WNetEnumResourceA/WNetEnumResourceW +#endif DWORD qxeWNetEnumResource (HANDLE hEnum, LPDWORD lpcCount, LPVOID lpBuffer, LPDWORD lpBufferSize); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetGetUniversalName +#define WNetGetUniversalName error use qxeWNetGetUniversalName or WNetGetUniversalNameA/WNetGetUniversalNameW +#endif DWORD qxeWNetGetUniversalName (const Extbyte * lpLocalPath, DWORD dwInfoLevel, LPVOID lpBuffer, LPDWORD lpBufferSize); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetGetUser +#define WNetGetUser error use qxeWNetGetUser or WNetGetUserA/WNetGetUserW +#endif DWORD qxeWNetGetUser (const Extbyte * lpName, Extbyte * lpUserName, LPDWORD lpnLength); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetGetProviderName +#define WNetGetProviderName error use qxeWNetGetProviderName or WNetGetProviderNameA/WNetGetProviderNameW +#endif DWORD qxeWNetGetProviderName (DWORD dwNetType, Extbyte * lpProviderName, LPDWORD lpBufferSize); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetGetNetworkInformation +#define WNetGetNetworkInformation error use qxeWNetGetNetworkInformation or WNetGetNetworkInformationA/WNetGetNetworkInformationW +#endif DWORD qxeWNetGetNetworkInformation (const Extbyte * lpProvider, LPNETINFOSTRUCT lpNetInfoStruct); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WNetGetLastError +#define WNetGetLastError error use qxeWNetGetLastError or WNetGetLastErrorA/WNetGetLastErrorW +#endif DWORD qxeWNetGetLastError (LPDWORD lpError, Extbyte * lpErrorBuf, DWORD nErrorBufSize, Extbyte * lpNameBuf, DWORD nNameBufSize); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef MultinetGetConnectionPerformance +#define MultinetGetConnectionPerformance error use qxeMultinetGetConnectionPerformance or MultinetGetConnectionPerformanceA/MultinetGetConnectionPerformanceW +#endif DWORD qxeMultinetGetConnectionPerformance (LPNETRESOURCEW lpNetResource, LPNETCONNECTINFOSTRUCT lpNetConnectInfoStruct); #endif /* defined (HAVE_MS_WINDOWS) */ + /* Processing file WINREG.H */ /* Skipping RegConnectRegistry because error in Cygwin prototype */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegCreateKey +#define RegCreateKey error use qxeRegCreateKey or RegCreateKeyA/RegCreateKeyW +#endif LONG qxeRegCreateKey (HKEY hKey, const Extbyte * lpSubKey, PHKEY phkResult); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegCreateKeyEx +#define RegCreateKeyEx error use qxeRegCreateKeyEx or RegCreateKeyExA/RegCreateKeyExW +#endif LONG qxeRegCreateKeyEx (HKEY hKey, const Extbyte * lpSubKey, DWORD Reserved, Extbyte * lpClass, DWORD dwOptions, REGSAM samDesired, LPSECURITY_ATTRIBUTES lpSecurityAttributes, PHKEY phkResult, LPDWORD lpdwDisposition); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegDeleteKey +#define RegDeleteKey error use qxeRegDeleteKey or RegDeleteKeyA/RegDeleteKeyW +#endif LONG qxeRegDeleteKey (HKEY hKey, const Extbyte * lpSubKey); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegDeleteValue +#define RegDeleteValue error use qxeRegDeleteValue or RegDeleteValueA/RegDeleteValueW +#endif LONG qxeRegDeleteValue (HKEY hKey, const Extbyte * lpValueName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegEnumKey +#define RegEnumKey error use qxeRegEnumKey or RegEnumKeyA/RegEnumKeyW +#endif LONG qxeRegEnumKey (HKEY hKey, DWORD dwIndex, Extbyte * lpName, DWORD cbName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegEnumKeyEx +#define RegEnumKeyEx error use qxeRegEnumKeyEx or RegEnumKeyExA/RegEnumKeyExW +#endif LONG qxeRegEnumKeyEx (HKEY hKey, DWORD dwIndex, Extbyte * lpName, LPDWORD lpcbName, LPDWORD lpReserved, Extbyte * lpClass, LPDWORD lpcbClass, PFILETIME lpftLastWriteTime); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegEnumValue +#define RegEnumValue error use qxeRegEnumValue or RegEnumValueA/RegEnumValueW +#endif LONG qxeRegEnumValue (HKEY hKey, DWORD dwIndex, Extbyte * lpValueName, LPDWORD lpcbValueName, LPDWORD lpReserved, LPDWORD lpType, LPBYTE lpData, LPDWORD lpcbData); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegLoadKey +#define RegLoadKey error use qxeRegLoadKey or RegLoadKeyA/RegLoadKeyW +#endif LONG qxeRegLoadKey (HKEY hKey, const Extbyte * lpSubKey, const Extbyte * lpFile); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegOpenKey +#define RegOpenKey error use qxeRegOpenKey or RegOpenKeyA/RegOpenKeyW +#endif LONG qxeRegOpenKey (HKEY hKey, const Extbyte * lpSubKey, PHKEY phkResult); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegOpenKeyEx +#define RegOpenKeyEx error use qxeRegOpenKeyEx or RegOpenKeyExA/RegOpenKeyExW +#endif LONG qxeRegOpenKeyEx (HKEY hKey, const Extbyte * lpSubKey, DWORD ulOptions, REGSAM samDesired, PHKEY phkResult); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegQueryInfoKey +#define RegQueryInfoKey error use qxeRegQueryInfoKey or RegQueryInfoKeyA/RegQueryInfoKeyW +#endif LONG qxeRegQueryInfoKey (HKEY hKey, Extbyte * lpClass, LPDWORD lpcbClass, LPDWORD lpReserved, LPDWORD lpcSubKeys, LPDWORD lpcbMaxSubKeyLen, LPDWORD lpcbMaxClassLen, LPDWORD lpcValues, LPDWORD lpcbMaxValueNameLen, LPDWORD lpcbMaxValueLen, LPDWORD lpcbSecurityDescriptor, PFILETIME lpftLastWriteTime); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegQueryValue +#define RegQueryValue error use qxeRegQueryValue or RegQueryValueA/RegQueryValueW +#endif LONG qxeRegQueryValue (HKEY hKey, const Extbyte * lpSubKey, Extbyte * lpValue, PLONG lpcbValue); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegQueryMultipleValues +#define RegQueryMultipleValues error use qxeRegQueryMultipleValues or RegQueryMultipleValuesA/RegQueryMultipleValuesW +#endif LONG qxeRegQueryMultipleValues (HKEY hKey, PVALENTW val_list, DWORD num_vals, Extbyte * lpValueBuf, LPDWORD ldwTotsize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegQueryValueEx +#define RegQueryValueEx error use qxeRegQueryValueEx or RegQueryValueExA/RegQueryValueExW +#endif LONG qxeRegQueryValueEx (HKEY hKey, const Extbyte * lpValueName, LPDWORD lpReserved, LPDWORD lpType, LPBYTE lpData, LPDWORD lpcbData); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegReplaceKey +#define RegReplaceKey error use qxeRegReplaceKey or RegReplaceKeyA/RegReplaceKeyW +#endif LONG qxeRegReplaceKey (HKEY hKey, const Extbyte * lpSubKey, const Extbyte * lpNewFile, const Extbyte * lpOldFile); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegRestoreKey +#define RegRestoreKey error use qxeRegRestoreKey or RegRestoreKeyA/RegRestoreKeyW +#endif LONG qxeRegRestoreKey (HKEY hKey, const Extbyte * lpFile, DWORD dwFlags); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegSaveKey +#define RegSaveKey error use qxeRegSaveKey or RegSaveKeyA/RegSaveKeyW +#endif LONG qxeRegSaveKey (HKEY hKey, const Extbyte * lpFile, LPSECURITY_ATTRIBUTES lpSecurityAttributes); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegSetValue +#define RegSetValue error use qxeRegSetValue or RegSetValueA/RegSetValueW +#endif LONG qxeRegSetValue (HKEY hKey, const Extbyte * lpSubKey, DWORD dwType, const Extbyte * lpData, DWORD cbData); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegSetValueEx +#define RegSetValueEx error use qxeRegSetValueEx or RegSetValueExA/RegSetValueExW +#endif LONG qxeRegSetValueEx (HKEY hKey, const Extbyte * lpValueName, DWORD Reserved, DWORD dwType, CONST BYTE* lpData, DWORD cbData); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegUnLoadKey +#define RegUnLoadKey error use qxeRegUnLoadKey or RegUnLoadKeyA/RegUnLoadKeyW +#endif LONG qxeRegUnLoadKey (HKEY hKey, const Extbyte * lpSubKey); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef InitiateSystemShutdown +#define InitiateSystemShutdown error use qxeInitiateSystemShutdown or InitiateSystemShutdownA/InitiateSystemShutdownW +#endif BOOL qxeInitiateSystemShutdown (Extbyte * lpMachineName, Extbyte * lpMessage, DWORD dwTimeout, BOOL bForceAppsClosed, BOOL bRebootAfterShutdown); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef AbortSystemShutdown +#define AbortSystemShutdown error use qxeAbortSystemShutdown or AbortSystemShutdownA/AbortSystemShutdownW +#endif BOOL qxeAbortSystemShutdown (Extbyte * lpMachineName); + /* Processing file SHELLAPI.H */ +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DragQueryFile +#define DragQueryFile error use qxeDragQueryFile or DragQueryFileA/DragQueryFileW +#endif UINT qxeDragQueryFile (HDROP arg1, UINT arg2, Extbyte * arg3, UINT arg4); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ShellExecute +#define ShellExecute error use qxeShellExecute or ShellExecuteA/ShellExecuteW +#endif HINSTANCE qxeShellExecute (HWND hwnd, const Extbyte * lpOperation, const Extbyte * lpFile, const Extbyte * lpParameters, const Extbyte * lpDirectory, INT nShowCmd); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef FindExecutable +#define FindExecutable error use qxeFindExecutable or FindExecutableA/FindExecutableW +#endif HINSTANCE qxeFindExecutable (const Extbyte * lpFile, const Extbyte * lpDirectory, Extbyte * lpResult); + #undef CommandLineToArgv #define CommandLineToArgv error Unicode-only + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ShellAbout +#define ShellAbout error use qxeShellAbout or ShellAboutA/ShellAboutW +#endif INT qxeShellAbout (HWND hWnd, const Extbyte * szApp, const Extbyte * szOtherStuff, HICON hIcon); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ExtractAssociatedIcon +#define ExtractAssociatedIcon error use qxeExtractAssociatedIcon or ExtractAssociatedIconA/ExtractAssociatedIconW +#endif HICON qxeExtractAssociatedIcon (HINSTANCE hInst, Extbyte * lpIconPath, LPWORD lpiIcon); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ExtractIcon +#define ExtractIcon error use qxeExtractIcon or ExtractIconA/ExtractIconW +#endif HICON qxeExtractIcon (HINSTANCE hInst, const Extbyte * lpszExeFileName, UINT nIconIndex); + #if !defined (CYGWIN_HEADERS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DoEnvironmentSubst +#define DoEnvironmentSubst error use qxeDoEnvironmentSubst or DoEnvironmentSubstA/DoEnvironmentSubstW +#endif DWORD qxeDoEnvironmentSubst (Extbyte * szString, UINT cbString); #endif /* !defined (CYGWIN_HEADERS) */ + #undef FindEnvironmentString #define FindEnvironmentString error causes link error; NT 4.0+ only + /* Skipping ExtractIconEx because NT 4.0+ only, error in Cygwin prototype */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SHFileOperation +#define SHFileOperation error use qxeSHFileOperation or SHFileOperationA/SHFileOperationW +#endif int qxeSHFileOperation (LPSHFILEOPSTRUCTW lpFileOp); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ShellExecuteEx +#define ShellExecuteEx error use qxeShellExecuteEx or ShellExecuteExA/ShellExecuteExW +#endif BOOL qxeShellExecuteEx (LPSHELLEXECUTEINFOW lpExecInfo); + #undef WinExecError #define WinExecError error causes link error; NT 4.0+ only + #if !defined (CYGWIN_HEADERS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SHQueryRecycleBin +#define SHQueryRecycleBin error use qxeSHQueryRecycleBin or SHQueryRecycleBinA/SHQueryRecycleBinW +#endif HRESULT qxeSHQueryRecycleBin (const Extbyte * pszRootPath, LPSHQUERYRBINFO pSHQueryRBInfo); #endif /* !defined (CYGWIN_HEADERS) */ + #if !defined (CYGWIN_HEADERS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SHEmptyRecycleBin +#define SHEmptyRecycleBin error use qxeSHEmptyRecycleBin or SHEmptyRecycleBinA/SHEmptyRecycleBinW +#endif HRESULT qxeSHEmptyRecycleBin (HWND hwnd, const Extbyte * pszRootPath, DWORD dwFlags); #endif /* !defined (CYGWIN_HEADERS) */ + #undef Shell_NotifyIcon #define Shell_NotifyIcon error split-sized NOTIFYICONDATA, NT 4.0+ only + /* Skipping SHGetFileInfo because split-sized SHFILEINFO, NT 4.0+ only */ + #undef SHGetDiskFreeSpace #define SHGetDiskFreeSpace error causes link error; NT 4.0+ only + #if !defined (CYGWIN_HEADERS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SHGetNewLinkInfo +#define SHGetNewLinkInfo error use qxeSHGetNewLinkInfo or SHGetNewLinkInfoA/SHGetNewLinkInfoW +#endif BOOL qxeSHGetNewLinkInfo (const Extbyte * pszLinkTo, const Extbyte * pszDir, Extbyte * pszName, BOOL * pfMustCopy, UINT uFlags); #endif /* !defined (CYGWIN_HEADERS) */ + #if !defined (CYGWIN_HEADERS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SHInvokePrinterCommand +#define SHInvokePrinterCommand error use qxeSHInvokePrinterCommand or SHInvokePrinterCommandA/SHInvokePrinterCommandW +#endif BOOL qxeSHInvokePrinterCommand (HWND hwnd, UINT uAction, const Extbyte * lpBuf1, const Extbyte * lpBuf2, BOOL fModal); #endif /* !defined (CYGWIN_HEADERS) */ + /* Processing file WINCON.H */ +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef PeekConsoleInput +#define PeekConsoleInput error use qxePeekConsoleInput or PeekConsoleInputA/PeekConsoleInputW +#endif BOOL qxePeekConsoleInput (HANDLE hConsoleInput, PINPUT_RECORD lpBuffer, DWORD nLength, LPDWORD lpNumberOfEventsRead); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ReadConsoleInput +#define ReadConsoleInput error use qxeReadConsoleInput or ReadConsoleInputA/ReadConsoleInputW +#endif BOOL qxeReadConsoleInput (HANDLE hConsoleInput, PINPUT_RECORD lpBuffer, DWORD nLength, LPDWORD lpNumberOfEventsRead); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WriteConsoleInput +#define WriteConsoleInput error use qxeWriteConsoleInput or WriteConsoleInputA/WriteConsoleInputW +#endif BOOL qxeWriteConsoleInput (HANDLE hConsoleInput, CONST INPUT_RECORD * lpBuffer, DWORD nLength, LPDWORD lpNumberOfEventsWritten); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ReadConsoleOutput +#define ReadConsoleOutput error use qxeReadConsoleOutput or ReadConsoleOutputA/ReadConsoleOutputW +#endif BOOL qxeReadConsoleOutput (HANDLE hConsoleOutput, PCHAR_INFO lpBuffer, COORD dwBufferSize, COORD dwBufferCoord, PSMALL_RECT lpReadRegion); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WriteConsoleOutput +#define WriteConsoleOutput error use qxeWriteConsoleOutput or WriteConsoleOutputA/WriteConsoleOutputW +#endif BOOL qxeWriteConsoleOutput (HANDLE hConsoleOutput, CONST CHAR_INFO * lpBuffer, COORD dwBufferSize, COORD dwBufferCoord, PSMALL_RECT lpWriteRegion); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ReadConsoleOutputCharacter +#define ReadConsoleOutputCharacter error use qxeReadConsoleOutputCharacter or ReadConsoleOutputCharacterA/ReadConsoleOutputCharacterW +#endif BOOL qxeReadConsoleOutputCharacter (HANDLE hConsoleOutput, Extbyte * lpCharacter, DWORD nLength, COORD dwReadCoord, LPDWORD lpNumberOfCharsRead); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WriteConsoleOutputCharacter +#define WriteConsoleOutputCharacter error use qxeWriteConsoleOutputCharacter or WriteConsoleOutputCharacterA/WriteConsoleOutputCharacterW +#endif BOOL qxeWriteConsoleOutputCharacter (HANDLE hConsoleOutput, const Extbyte * lpCharacter, DWORD nLength, COORD dwWriteCoord, LPDWORD lpNumberOfCharsWritten); + #undef FillConsoleOutputCharacter #define FillConsoleOutputCharacter error split CHAR + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ScrollConsoleScreenBuffer +#define ScrollConsoleScreenBuffer error use qxeScrollConsoleScreenBuffer or ScrollConsoleScreenBufferA/ScrollConsoleScreenBufferW +#endif BOOL qxeScrollConsoleScreenBuffer (HANDLE hConsoleOutput, CONST SMALL_RECT * lpScrollRectangle, CONST SMALL_RECT * lpClipRectangle, COORD dwDestinationOrigin, CONST CHAR_INFO * lpFill); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetConsoleTitle +#define GetConsoleTitle error use qxeGetConsoleTitle or GetConsoleTitleA/GetConsoleTitleW +#endif DWORD qxeGetConsoleTitle (Extbyte * lpConsoleTitle, DWORD nSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetConsoleTitle +#define SetConsoleTitle error use qxeSetConsoleTitle or SetConsoleTitleA/SetConsoleTitleW +#endif BOOL qxeSetConsoleTitle (const Extbyte * lpConsoleTitle); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ReadConsole +#define ReadConsole error use qxeReadConsole or ReadConsoleA/ReadConsoleW +#endif BOOL qxeReadConsole (HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfCharsToRead, LPDWORD lpNumberOfCharsRead, LPVOID lpReserved); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WriteConsole +#define WriteConsole error use qxeWriteConsole or WriteConsoleA/WriteConsoleW +#endif BOOL qxeWriteConsole (HANDLE hConsoleOutput, CONST VOID * lpBuffer, DWORD nNumberOfCharsToWrite, LPDWORD lpNumberOfCharsWritten, LPVOID lpReserved); + /* Processing file IMM.H */ #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmInstallIME +#define ImmInstallIME error use qxeImmInstallIME or ImmInstallIMEA/ImmInstallIMEW +#endif HKL qxeImmInstallIME (const Extbyte * lpszIMEFileName, const Extbyte * lpszLayoutText); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmGetDescription +#define ImmGetDescription error use qxeImmGetDescription or ImmGetDescriptionA/ImmGetDescriptionW +#endif UINT qxeImmGetDescription (HKL arg1, Extbyte * arg2, UINT uBufLen); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmGetIMEFileName +#define ImmGetIMEFileName error use qxeImmGetIMEFileName or ImmGetIMEFileNameA/ImmGetIMEFileNameW +#endif UINT qxeImmGetIMEFileName (HKL arg1, Extbyte * arg2, UINT uBufLen); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmGetCompositionString +#define ImmGetCompositionString error use qxeImmGetCompositionString or ImmGetCompositionStringA/ImmGetCompositionStringW +#endif LONG qxeImmGetCompositionString (HIMC arg1, DWORD arg2, LPVOID arg3, DWORD arg4); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmSetCompositionString +#define ImmSetCompositionString error use qxeImmSetCompositionString or ImmSetCompositionStringA/ImmSetCompositionStringW +#endif BOOL qxeImmSetCompositionString (HIMC arg1, DWORD dwIndex, LPCVOID lpComp, DWORD arg4, LPCVOID lpRead, DWORD arg6); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmGetCandidateListCount +#define ImmGetCandidateListCount error use qxeImmGetCandidateListCount or ImmGetCandidateListCountA/ImmGetCandidateListCountW +#endif DWORD qxeImmGetCandidateListCount (HIMC arg1, LPDWORD lpdwListCount); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmGetCandidateList +#define ImmGetCandidateList error use qxeImmGetCandidateList or ImmGetCandidateListA/ImmGetCandidateListW +#endif DWORD qxeImmGetCandidateList (HIMC arg1, DWORD deIndex, LPCANDIDATELIST arg3, DWORD dwBufLen); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmGetGuideLine +#define ImmGetGuideLine error use qxeImmGetGuideLine or ImmGetGuideLineA/ImmGetGuideLineW +#endif DWORD qxeImmGetGuideLine (HIMC arg1, DWORD dwIndex, Extbyte * arg3, DWORD dwBufLen); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) /* Skipping ImmGetCompositionFont because split-sized LOGFONT */ #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) /* Skipping ImmSetCompositionFont because split-sized LOGFONT */ #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmConfigureIME +#define ImmConfigureIME error use qxeImmConfigureIME or ImmConfigureIMEA/ImmConfigureIMEW +#endif BOOL qxeImmConfigureIME (HKL arg1, HWND arg2, DWORD arg3, LPVOID arg4); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmEscape +#define ImmEscape error use qxeImmEscape or ImmEscapeA/ImmEscapeW +#endif LRESULT qxeImmEscape (HKL arg1, HIMC arg2, UINT arg3, LPVOID arg4); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmGetConversionList +#define ImmGetConversionList error use qxeImmGetConversionList or ImmGetConversionListA/ImmGetConversionListW +#endif DWORD qxeImmGetConversionList (HKL arg1, HIMC arg2, const Extbyte * arg3, LPCANDIDATELIST arg4, DWORD dwBufLen, UINT uFlag); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmIsUIMessage +#define ImmIsUIMessage error use qxeImmIsUIMessage or ImmIsUIMessageA/ImmIsUIMessageW +#endif BOOL qxeImmIsUIMessage (HWND arg1, UINT arg2, WPARAM arg3, LPARAM arg4); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmRegisterWord +#define ImmRegisterWord error use qxeImmRegisterWord or ImmRegisterWordA/ImmRegisterWordW +#endif BOOL qxeImmRegisterWord (HKL arg1, const Extbyte * lpszReading, DWORD arg3, const Extbyte * lpszRegister); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmUnregisterWord +#define ImmUnregisterWord error use qxeImmUnregisterWord or ImmUnregisterWordA/ImmUnregisterWordW +#endif BOOL qxeImmUnregisterWord (HKL arg1, const Extbyte * lpszReading, DWORD arg3, const Extbyte * lpszUnregister); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef ImmGetRegisterWordStyle #define ImmGetRegisterWordStyle error split-sized STYLEBUF #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmEnumRegisterWord +#define ImmEnumRegisterWord error use qxeImmEnumRegisterWord or ImmEnumRegisterWordA/ImmEnumRegisterWordW +#endif UINT qxeImmEnumRegisterWord (HKL arg1, REGISTERWORDENUMPROCW arg2, const Extbyte * lpszReading, DWORD arg4, const Extbyte * lpszRegister, LPVOID arg6); #endif /* defined (HAVE_MS_WINDOWS) */ + #if defined (HAVE_MS_WINDOWS) #undef ImmGetImeMenuItems #define ImmGetImeMenuItems error split-sized IMEMENUITEMINFO #endif /* defined (HAVE_MS_WINDOWS) */ + /* Processing file DDEML.H */ +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DdeInitialize +#define DdeInitialize error use qxeDdeInitialize or DdeInitializeA/DdeInitializeW +#endif UINT qxeDdeInitialize (LPDWORD pidInst, PFNCALLBACK pfnCallback, DWORD afCmd, DWORD ulRes); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DdeCreateStringHandle +#define DdeCreateStringHandle error use qxeDdeCreateStringHandle or DdeCreateStringHandleA/DdeCreateStringHandleW +#endif HSZ qxeDdeCreateStringHandle (DWORD idInst, const Extbyte * psz, int iCodePage); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DdeQueryString +#define DdeQueryString error use qxeDdeQueryString or DdeQueryStringA/DdeQueryStringW +#endif DWORD qxeDdeQueryString (DWORD idInst, HSZ hsz, Extbyte * psz, DWORD cchMax, int iCodePage); + /* Processing file WINUSER.H */ +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef wvsprintf +#define wvsprintf error use qxewvsprintf or wvsprintfA/wvsprintfW +#endif int qxewvsprintf (Extbyte * arg1, const Extbyte * arg2, va_list arglist); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LoadKeyboardLayout +#define LoadKeyboardLayout error use qxeLoadKeyboardLayout or LoadKeyboardLayoutA/LoadKeyboardLayoutW +#endif HKL qxeLoadKeyboardLayout (const Extbyte * pwszKLID, UINT Flags); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetKeyboardLayoutName +#define GetKeyboardLayoutName error use qxeGetKeyboardLayoutName or GetKeyboardLayoutNameA/GetKeyboardLayoutNameW +#endif BOOL qxeGetKeyboardLayoutName (Extbyte * pwszKLID); + #undef CreateDesktop #define CreateDesktop error split-sized LPDEVMODE + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef OpenDesktop +#define OpenDesktop error use qxeOpenDesktop or OpenDesktopA/OpenDesktopW +#endif HDESK qxeOpenDesktop (Extbyte * lpszDesktop, DWORD dwFlags, BOOL fInherit, ACCESS_MASK dwDesiredAccess); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef EnumDesktops +#define EnumDesktops error use qxeEnumDesktops or EnumDesktopsA/EnumDesktopsW +#endif BOOL qxeEnumDesktops (HWINSTA hwinsta, DESKTOPENUMPROCW lpEnumFunc, LPARAM lParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateWindowStation +#define CreateWindowStation error use qxeCreateWindowStation or CreateWindowStationA/CreateWindowStationW +#endif HWINSTA qxeCreateWindowStation (Extbyte * lpwinsta, DWORD dwReserved, ACCESS_MASK dwDesiredAccess, LPSECURITY_ATTRIBUTES lpsa); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef OpenWindowStation +#define OpenWindowStation error use qxeOpenWindowStation or OpenWindowStationA/OpenWindowStationW +#endif HWINSTA qxeOpenWindowStation (Extbyte * lpszWinSta, BOOL fInherit, ACCESS_MASK dwDesiredAccess); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef EnumWindowStations +#define EnumWindowStations error use qxeEnumWindowStations or EnumWindowStationsA/EnumWindowStationsW +#endif BOOL qxeEnumWindowStations (WINSTAENUMPROCW lpEnumFunc, LPARAM lParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetUserObjectInformation +#define GetUserObjectInformation error use qxeGetUserObjectInformation or GetUserObjectInformationA/GetUserObjectInformationW +#endif BOOL qxeGetUserObjectInformation (HANDLE hObj, int nIndex, PVOID pvInfo, DWORD nLength, LPDWORD lpnLengthNeeded); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetUserObjectInformation +#define SetUserObjectInformation error use qxeSetUserObjectInformation or SetUserObjectInformationA/SetUserObjectInformationW +#endif BOOL qxeSetUserObjectInformation (HANDLE hObj, int nIndex, PVOID pvInfo, DWORD nLength); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegisterWindowMessage +#define RegisterWindowMessage error use qxeRegisterWindowMessage or RegisterWindowMessageA/RegisterWindowMessageW +#endif UINT qxeRegisterWindowMessage (const Extbyte * lpString); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetMessage +#define GetMessage error use qxeGetMessage or GetMessageA/GetMessageW +#endif BOOL qxeGetMessage (LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DispatchMessage +#define DispatchMessage error use qxeDispatchMessage or DispatchMessageA/DispatchMessageW +#endif LONG qxeDispatchMessage (CONST MSG * lpMsg); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef PeekMessage +#define PeekMessage error use qxePeekMessage or PeekMessageA/PeekMessageW +#endif BOOL qxePeekMessage (LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg); + /* Skipping SendMessage because split messages and structures */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SendMessageTimeout +#define SendMessageTimeout error use qxeSendMessageTimeout or SendMessageTimeoutA/SendMessageTimeoutW +#endif LRESULT qxeSendMessageTimeout (HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, UINT fuFlags, UINT uTimeout, LPDWORD lpdwResult); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SendNotifyMessage +#define SendNotifyMessage error use qxeSendNotifyMessage or SendNotifyMessageA/SendNotifyMessageW +#endif BOOL qxeSendNotifyMessage (HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SendMessageCallback +#define SendMessageCallback error use qxeSendMessageCallback or SendMessageCallbackA/SendMessageCallbackW +#endif BOOL qxeSendMessageCallback (HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, SENDASYNCPROC lpResultCallBack, DWORD dwData); + #undef BroadcastSystemMessage #define BroadcastSystemMessage error win95 version not split; NT 4.0+ only + #undef RegisterDeviceNotification #define RegisterDeviceNotification error NT 5.0+ only + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef PostMessage +#define PostMessage error use qxePostMessage or PostMessageA/PostMessageW +#endif BOOL qxePostMessage (HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef PostThreadMessage +#define PostThreadMessage error use qxePostThreadMessage or PostThreadMessageA/PostThreadMessageW +#endif BOOL qxePostThreadMessage (DWORD idThread, UINT Msg, WPARAM wParam, LPARAM lParam); + /* Skipping DefWindowProc because return value is conditionalized on _MAC, messes up parser */ + #undef CallWindowProc #define CallWindowProc error two versions, STRICT and non-STRICT + #undef CallWindowProc #define CallWindowProc error two versions, STRICT and non-STRICT + /* Skipping RegisterClass because need to intercept so we can provide our own window procedure and handle split notify messages; split-simple WNDCLASS */ + /* Skipping UnregisterClass because need to intercept for reasons related to RegisterClass */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetClassInfo +#define GetClassInfo error use qxeGetClassInfo or GetClassInfoA/GetClassInfoW +#endif BOOL qxeGetClassInfo (HINSTANCE hInstance, const Extbyte * lpClassName, LPWNDCLASSW lpWndClass); + /* Skipping RegisterClassEx because need to intercept so we can provide our own window procedure and handle split notify messages; split-simple WNDCLASSEX; NT 4.0+ only */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetClassInfoEx +#define GetClassInfoEx error use qxeGetClassInfoEx or GetClassInfoExA/GetClassInfoExW +#endif BOOL qxeGetClassInfoEx (HINSTANCE arg1, const Extbyte * arg2, LPWNDCLASSEXW arg3); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateWindowEx +#define CreateWindowEx error use qxeCreateWindowEx or CreateWindowExA/CreateWindowExW +#endif HWND qxeCreateWindowEx (DWORD dwExStyle, const Extbyte * lpClassName, const Extbyte * lpWindowName, DWORD dwStyle, int X, int Y, int nWidth, int nHeight, HWND hWndParent, HMENU hMenu, HINSTANCE hInstance, LPVOID lpParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateDialogParam +#define CreateDialogParam error use qxeCreateDialogParam or CreateDialogParamA/CreateDialogParamW +#endif HWND qxeCreateDialogParam (HINSTANCE hInstance, const Extbyte * lpTemplateName, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateDialogIndirectParam +#define CreateDialogIndirectParam error use qxeCreateDialogIndirectParam or CreateDialogIndirectParamA/CreateDialogIndirectParamW +#endif HWND qxeCreateDialogIndirectParam (HINSTANCE hInstance, LPCDLGTEMPLATEW lpTemplate, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DialogBoxParam +#define DialogBoxParam error use qxeDialogBoxParam or DialogBoxParamA/DialogBoxParamW +#endif int qxeDialogBoxParam (HINSTANCE hInstance, const Extbyte * lpTemplateName, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DialogBoxIndirectParam +#define DialogBoxIndirectParam error use qxeDialogBoxIndirectParam or DialogBoxIndirectParamA/DialogBoxIndirectParamW +#endif int qxeDialogBoxIndirectParam (HINSTANCE hInstance, LPCDLGTEMPLATEW hDialogTemplate, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetDlgItemText +#define SetDlgItemText error use qxeSetDlgItemText or SetDlgItemTextA/SetDlgItemTextW +#endif BOOL qxeSetDlgItemText (HWND hDlg, int nIDDlgItem, const Extbyte * lpString); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetDlgItemText +#define GetDlgItemText error use qxeGetDlgItemText or GetDlgItemTextA/GetDlgItemTextW +#endif UINT qxeGetDlgItemText (HWND hDlg, int nIDDlgItem, Extbyte * lpString, int nMaxCount); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SendDlgItemMessage +#define SendDlgItemMessage error use qxeSendDlgItemMessage or SendDlgItemMessageA/SendDlgItemMessageW +#endif LONG qxeSendDlgItemMessage (HWND hDlg, int nIDDlgItem, UINT Msg, WPARAM wParam, LPARAM lParam); + #undef DefDlgProc #define DefDlgProc error return value is conditionalized on _MAC, messes up parser + #if !defined (CYGWIN_HEADERS) +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CallMsgFilter +#define CallMsgFilter error use qxeCallMsgFilter or CallMsgFilterA/CallMsgFilterW +#endif BOOL qxeCallMsgFilter (LPMSG lpMsg, int nCode); #endif /* !defined (CYGWIN_HEADERS) */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegisterClipboardFormat +#define RegisterClipboardFormat error use qxeRegisterClipboardFormat or RegisterClipboardFormatA/RegisterClipboardFormatW +#endif UINT qxeRegisterClipboardFormat (const Extbyte * lpszFormat); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetClipboardFormatName +#define GetClipboardFormatName error use qxeGetClipboardFormatName or GetClipboardFormatNameA/GetClipboardFormatNameW +#endif int qxeGetClipboardFormatName (UINT format, Extbyte * lpszFormatName, int cchMaxCount); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CharToOem +#define CharToOem error use qxeCharToOem or CharToOemA/CharToOemW +#endif BOOL qxeCharToOem (const Extbyte * lpszSrc, LPSTR lpszDst); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef OemToChar +#define OemToChar error use qxeOemToChar or OemToCharA/OemToCharW +#endif BOOL qxeOemToChar (LPCSTR lpszSrc, Extbyte * lpszDst); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CharToOemBuff +#define CharToOemBuff error use qxeCharToOemBuff or CharToOemBuffA/CharToOemBuffW +#endif BOOL qxeCharToOemBuff (const Extbyte * lpszSrc, LPSTR lpszDst, DWORD cchDstLength); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef OemToCharBuff +#define OemToCharBuff error use qxeOemToCharBuff or OemToCharBuffA/OemToCharBuffW +#endif BOOL qxeOemToCharBuff (LPCSTR lpszSrc, Extbyte * lpszDst, DWORD cchDstLength); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CharUpper +#define CharUpper error use qxeCharUpper or CharUpperA/CharUpperW +#endif Extbyte * qxeCharUpper (Extbyte * lpsz); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CharUpperBuff +#define CharUpperBuff error use qxeCharUpperBuff or CharUpperBuffA/CharUpperBuffW +#endif DWORD qxeCharUpperBuff (Extbyte * lpsz, DWORD cchLength); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CharLower +#define CharLower error use qxeCharLower or CharLowerA/CharLowerW +#endif Extbyte * qxeCharLower (Extbyte * lpsz); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CharLowerBuff +#define CharLowerBuff error use qxeCharLowerBuff or CharLowerBuffA/CharLowerBuffW +#endif DWORD qxeCharLowerBuff (Extbyte * lpsz, DWORD cchLength); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CharNext +#define CharNext error use qxeCharNext or CharNextA/CharNextW +#endif Extbyte * qxeCharNext (const Extbyte * lpsz); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CharPrev +#define CharPrev error use qxeCharPrev or CharPrevA/CharPrevW +#endif Extbyte * qxeCharPrev (const Extbyte * lpszStart, const Extbyte * lpszCurrent); + #undef IsCharAlpha #define IsCharAlpha error split CHAR + #undef IsCharAlphaNumeric #define IsCharAlphaNumeric error split CHAR + #undef IsCharUpper #define IsCharUpper error split CHAR + #undef IsCharLower #define IsCharLower error split CHAR + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetKeyNameText +#define GetKeyNameText error use qxeGetKeyNameText or GetKeyNameTextA/GetKeyNameTextW +#endif int qxeGetKeyNameText (LONG lParam, Extbyte * lpString, int nSize); + /* Skipping VkKeyScan because split CHAR */ + #undef VkKeyScanEx #define VkKeyScanEx error split CHAR; NT 4.0+ only + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef MapVirtualKey +#define MapVirtualKey error use qxeMapVirtualKey or MapVirtualKeyA/MapVirtualKeyW +#endif UINT qxeMapVirtualKey (UINT uCode, UINT uMapType); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef MapVirtualKeyEx +#define MapVirtualKeyEx error use qxeMapVirtualKeyEx or MapVirtualKeyExA/MapVirtualKeyExW +#endif UINT qxeMapVirtualKeyEx (UINT uCode, UINT uMapType, HKL dwhkl); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LoadAccelerators +#define LoadAccelerators error use qxeLoadAccelerators or LoadAcceleratorsA/LoadAcceleratorsW +#endif HACCEL qxeLoadAccelerators (HINSTANCE hInstance, const Extbyte * lpTableName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateAcceleratorTable +#define CreateAcceleratorTable error use qxeCreateAcceleratorTable or CreateAcceleratorTableA/CreateAcceleratorTableW +#endif HACCEL qxeCreateAcceleratorTable (LPACCEL arg1, int arg2); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CopyAcceleratorTable +#define CopyAcceleratorTable error use qxeCopyAcceleratorTable or CopyAcceleratorTableA/CopyAcceleratorTableW +#endif int qxeCopyAcceleratorTable (HACCEL hAccelSrc, LPACCEL lpAccelDst, int cAccelEntries); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef TranslateAccelerator +#define TranslateAccelerator error use qxeTranslateAccelerator or TranslateAcceleratorA/TranslateAcceleratorW +#endif int qxeTranslateAccelerator (HWND hWnd, HACCEL hAccTable, LPMSG lpMsg); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LoadMenu +#define LoadMenu error use qxeLoadMenu or LoadMenuA/LoadMenuW +#endif HMENU qxeLoadMenu (HINSTANCE hInstance, const Extbyte * lpMenuName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LoadMenuIndirect +#define LoadMenuIndirect error use qxeLoadMenuIndirect or LoadMenuIndirectA/LoadMenuIndirectW +#endif HMENU qxeLoadMenuIndirect (CONST MENUTEMPLATEW * lpMenuTemplate); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ChangeMenu +#define ChangeMenu error use qxeChangeMenu or ChangeMenuA/ChangeMenuW +#endif BOOL qxeChangeMenu (HMENU hMenu, UINT cmd, const Extbyte * lpszNewItem, UINT cmdInsert, UINT flags); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetMenuString +#define GetMenuString error use qxeGetMenuString or GetMenuStringA/GetMenuStringW +#endif int qxeGetMenuString (HMENU hMenu, UINT uIDItem, Extbyte * lpString, int nMaxCount, UINT uFlag); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef InsertMenu +#define InsertMenu error use qxeInsertMenu or InsertMenuA/InsertMenuW +#endif BOOL qxeInsertMenu (HMENU hMenu, UINT uPosition, UINT uFlags, UINT uIDNewItem, const Extbyte * lpNewItem); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef AppendMenu +#define AppendMenu error use qxeAppendMenu or AppendMenuA/AppendMenuW +#endif BOOL qxeAppendMenu (HMENU hMenu, UINT uFlags, UINT uIDNewItem, const Extbyte * lpNewItem); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ModifyMenu +#define ModifyMenu error use qxeModifyMenu or ModifyMenuA/ModifyMenuW +#endif BOOL qxeModifyMenu (HMENU hMnu, UINT uPosition, UINT uFlags, UINT uIDNewItem, const Extbyte * lpNewItem); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef InsertMenuItem +#define InsertMenuItem error use qxeInsertMenuItem or InsertMenuItemA/InsertMenuItemW +#endif BOOL qxeInsertMenuItem (HMENU arg1, UINT arg2, BOOL arg3, LPCMENUITEMINFOW arg4); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetMenuItemInfo +#define GetMenuItemInfo error use qxeGetMenuItemInfo or GetMenuItemInfoA/GetMenuItemInfoW +#endif BOOL qxeGetMenuItemInfo (HMENU arg1, UINT arg2, BOOL arg3, LPMENUITEMINFOW arg4); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetMenuItemInfo +#define SetMenuItemInfo error use qxeSetMenuItemInfo or SetMenuItemInfoA/SetMenuItemInfoW +#endif BOOL qxeSetMenuItemInfo (HMENU arg1, UINT arg2, BOOL arg3, LPCMENUITEMINFOW arg4); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DrawText +#define DrawText error use qxeDrawText or DrawTextA/DrawTextW +#endif int qxeDrawText (HDC hDC, const Extbyte * lpString, int nCount, LPRECT lpRect, UINT uFormat); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DrawTextEx +#define DrawTextEx error use qxeDrawTextEx or DrawTextExA/DrawTextExW +#endif int qxeDrawTextEx (HDC arg1, Extbyte * arg2, int arg3, LPRECT arg4, UINT arg5, LPDRAWTEXTPARAMS arg6); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GrayString +#define GrayString error use qxeGrayString or GrayStringA/GrayStringW +#endif BOOL qxeGrayString (HDC hDC, HBRUSH hBrush, GRAYSTRINGPROC lpOutputFunc, LPARAM lpData, int nCount, int X, int Y, int nWidth, int nHeight); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DrawState +#define DrawState error use qxeDrawState or DrawStateA/DrawStateW +#endif BOOL qxeDrawState (HDC arg1, HBRUSH arg2, DRAWSTATEPROC arg3, LPARAM arg4, WPARAM arg5, int arg6, int arg7, int arg8, int arg9, UINT arg10); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef TabbedTextOut +#define TabbedTextOut error use qxeTabbedTextOut or TabbedTextOutA/TabbedTextOutW +#endif LONG qxeTabbedTextOut (HDC hDC, int X, int Y, const Extbyte * lpString, int nCount, int nTabPositions, LPINT lpnTabStopPositions, int nTabOrigin); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetTabbedTextExtent +#define GetTabbedTextExtent error use qxeGetTabbedTextExtent or GetTabbedTextExtentA/GetTabbedTextExtentW +#endif DWORD qxeGetTabbedTextExtent (HDC hDC, const Extbyte * lpString, int nCount, int nTabPositions, LPINT lpnTabStopPositions); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetProp +#define SetProp error use qxeSetProp or SetPropA/SetPropW +#endif BOOL qxeSetProp (HWND hWnd, const Extbyte * lpString, HANDLE hData); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetProp +#define GetProp error use qxeGetProp or GetPropA/GetPropW +#endif HANDLE qxeGetProp (HWND hWnd, const Extbyte * lpString); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RemoveProp +#define RemoveProp error use qxeRemoveProp or RemovePropA/RemovePropW +#endif HANDLE qxeRemoveProp (HWND hWnd, const Extbyte * lpString); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef EnumPropsEx +#define EnumPropsEx error use qxeEnumPropsEx or EnumPropsExA/EnumPropsExW +#endif int qxeEnumPropsEx (HWND hWnd, PROPENUMPROCEXW lpEnumFunc, LPARAM lParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef EnumProps +#define EnumProps error use qxeEnumProps or EnumPropsA/EnumPropsW +#endif int qxeEnumProps (HWND hWnd, PROPENUMPROCW lpEnumFunc); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetWindowText +#define SetWindowText error use qxeSetWindowText or SetWindowTextA/SetWindowTextW +#endif BOOL qxeSetWindowText (HWND hWnd, const Extbyte * lpString); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetWindowText +#define GetWindowText error use qxeGetWindowText or GetWindowTextA/GetWindowTextW +#endif int qxeGetWindowText (HWND hWnd, Extbyte * lpString, int nMaxCount); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetWindowTextLength +#define GetWindowTextLength error use qxeGetWindowTextLength or GetWindowTextLengthA/GetWindowTextLengthW +#endif int qxeGetWindowTextLength (HWND hWnd); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef MessageBox +#define MessageBox error use qxeMessageBox or MessageBoxA/MessageBoxW +#endif int qxeMessageBox (HWND hWnd, const Extbyte * lpText, const Extbyte * lpCaption, UINT uType); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef MessageBoxEx +#define MessageBoxEx error use qxeMessageBoxEx or MessageBoxExA/MessageBoxExW +#endif int qxeMessageBoxEx (HWND hWnd, const Extbyte * lpText, const Extbyte * lpCaption, UINT uType, WORD wLanguageId); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef MessageBoxIndirect +#define MessageBoxIndirect error use qxeMessageBoxIndirect or MessageBoxIndirectA/MessageBoxIndirectW +#endif int qxeMessageBoxIndirect (LPMSGBOXPARAMSW arg1); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetWindowLong +#define GetWindowLong error use qxeGetWindowLong or GetWindowLongA/GetWindowLongW +#endif LONG qxeGetWindowLong (HWND hWnd, int nIndex); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetWindowLong +#define SetWindowLong error use qxeSetWindowLong or SetWindowLongA/SetWindowLongW +#endif LONG qxeSetWindowLong (HWND hWnd, int nIndex, LONG dwNewLong); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetClassLong +#define GetClassLong error use qxeGetClassLong or GetClassLongA/GetClassLongW +#endif DWORD qxeGetClassLong (HWND hWnd, int nIndex); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetClassLong +#define SetClassLong error use qxeSetClassLong or SetClassLongA/SetClassLongW +#endif DWORD qxeSetClassLong (HWND hWnd, int nIndex, LONG dwNewLong); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef FindWindow +#define FindWindow error use qxeFindWindow or FindWindowA/FindWindowW +#endif HWND qxeFindWindow (const Extbyte * lpClassName, const Extbyte * lpWindowName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef FindWindowEx +#define FindWindowEx error use qxeFindWindowEx or FindWindowExA/FindWindowExW +#endif HWND qxeFindWindowEx (HWND arg1, HWND arg2, const Extbyte * arg3, const Extbyte * arg4); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetClassName +#define GetClassName error use qxeGetClassName or GetClassNameA/GetClassNameW +#endif int qxeGetClassName (HWND hWnd, Extbyte * lpClassName, int nMaxCount); -#undef SetWindowsHook -#define SetWindowsHook error obsolete; two versions, STRICT and non-STRICT + #undef SetWindowsHook #define SetWindowsHook error obsolete; two versions, STRICT and non-STRICT + +#undef SetWindowsHook +#define SetWindowsHook error obsolete; two versions, STRICT and non-STRICT + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetWindowsHookEx +#define SetWindowsHookEx error use qxeSetWindowsHookEx or SetWindowsHookExA/SetWindowsHookExW +#endif HHOOK qxeSetWindowsHookEx (int idHook, HOOKPROC lpfn, HINSTANCE hmod, DWORD dwThreadId); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LoadBitmap +#define LoadBitmap error use qxeLoadBitmap or LoadBitmapA/LoadBitmapW +#endif HBITMAP qxeLoadBitmap (HINSTANCE hInstance, const Extbyte * lpBitmapName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LoadCursor +#define LoadCursor error use qxeLoadCursor or LoadCursorA/LoadCursorW +#endif HCURSOR qxeLoadCursor (HINSTANCE hInstance, const Extbyte * lpCursorName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LoadCursorFromFile +#define LoadCursorFromFile error use qxeLoadCursorFromFile or LoadCursorFromFileA/LoadCursorFromFileW +#endif HCURSOR qxeLoadCursorFromFile (const Extbyte * lpFileName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LoadIcon +#define LoadIcon error use qxeLoadIcon or LoadIconA/LoadIconW +#endif HICON qxeLoadIcon (HINSTANCE hInstance, const Extbyte * lpIconName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LoadImage +#define LoadImage error use qxeLoadImage or LoadImageA/LoadImageW +#endif HANDLE qxeLoadImage (HINSTANCE arg1, const Extbyte * arg2, UINT arg3, int arg4, int arg5, UINT arg6); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LoadString +#define LoadString error use qxeLoadString or LoadStringA/LoadStringW +#endif int qxeLoadString (HINSTANCE hInstance, UINT uID, Extbyte * lpBuffer, int nBufferMax); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef IsDialogMessage +#define IsDialogMessage error use qxeIsDialogMessage or IsDialogMessageA/IsDialogMessageW +#endif BOOL qxeIsDialogMessage (HWND hDlg, LPMSG lpMsg); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DlgDirList +#define DlgDirList error use qxeDlgDirList or DlgDirListA/DlgDirListW +#endif int qxeDlgDirList (HWND hDlg, Extbyte * lpPathSpec, int nIDListBox, int nIDStaticPath, UINT uFileType); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DlgDirSelectEx +#define DlgDirSelectEx error use qxeDlgDirSelectEx or DlgDirSelectExA/DlgDirSelectExW +#endif BOOL qxeDlgDirSelectEx (HWND hDlg, Extbyte * lpString, int nCount, int nIDListBox); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DlgDirListComboBox +#define DlgDirListComboBox error use qxeDlgDirListComboBox or DlgDirListComboBoxA/DlgDirListComboBoxW +#endif int qxeDlgDirListComboBox (HWND hDlg, Extbyte * lpPathSpec, int nIDComboBox, int nIDStaticPath, UINT uFiletype); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DlgDirSelectComboBoxEx +#define DlgDirSelectComboBoxEx error use qxeDlgDirSelectComboBoxEx or DlgDirSelectComboBoxExA/DlgDirSelectComboBoxExW +#endif BOOL qxeDlgDirSelectComboBoxEx (HWND hDlg, Extbyte * lpString, int nCount, int nIDComboBox); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DefFrameProc +#define DefFrameProc error use qxeDefFrameProc or DefFrameProcA/DefFrameProcW +#endif LRESULT qxeDefFrameProc (HWND hWnd, HWND hWndMDIClient, UINT uMsg, WPARAM wParam, LPARAM lParam); + #undef DefMDIChildProc #define DefMDIChildProc error return value is conditionalized on _MAC, messes up parser + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateMDIWindow +#define CreateMDIWindow error use qxeCreateMDIWindow or CreateMDIWindowA/CreateMDIWindowW +#endif HWND qxeCreateMDIWindow (Extbyte * lpClassName, Extbyte * lpWindowName, DWORD dwStyle, int X, int Y, int nWidth, int nHeight, HWND hWndParent, HINSTANCE hInstance, LPARAM lParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WinHelp +#define WinHelp error use qxeWinHelp or WinHelpA/WinHelpW +#endif BOOL qxeWinHelp (HWND hWndMain, const Extbyte * lpszHelp, UINT uCommand, DWORD dwData); + #undef ChangeDisplaySettings #define ChangeDisplaySettings error split-sized LPDEVMODE + #undef ChangeDisplaySettingsEx #define ChangeDisplaySettingsEx error split-sized LPDEVMODE; NT 5.0/Win98+ only + #undef EnumDisplaySettings #define EnumDisplaySettings error split-sized LPDEVMODE + #undef EnumDisplayDevices #define EnumDisplayDevices error split-sized PDISPLAY_DEVICE; NT 5.0+ only, no Win98 + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SystemParametersInfo +#define SystemParametersInfo error use qxeSystemParametersInfo or SystemParametersInfoA/SystemParametersInfoW +#endif BOOL qxeSystemParametersInfo (UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni); + #undef GetMonitorInfo #define GetMonitorInfo error NT 5.0/Win98+ only + #undef GetWindowModuleFileName #define GetWindowModuleFileName error NT 5.0+ only + #undef RealGetWindowClass #define RealGetWindowClass error NT 5.0+ only + #undef GetAltTabInfo #define GetAltTabInfo error NT 5.0+ only + /* Processing file MMSYSTEM.H */ +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef sndPlaySound +#define sndPlaySound error use qxesndPlaySound or sndPlaySoundA/sndPlaySoundW +#endif BOOL qxesndPlaySound (const Extbyte * pszSound, UINT fuSound); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef PlaySound +#define PlaySound error use qxePlaySound or PlaySoundA/PlaySoundW +#endif BOOL qxePlaySound (const Extbyte * pszSound, HMODULE hmod, DWORD fdwSound); + #undef waveOutGetDevCaps #define waveOutGetDevCaps error split-sized LPWAVEOUTCAPS + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef waveOutGetErrorText +#define waveOutGetErrorText error use qxewaveOutGetErrorText or waveOutGetErrorTextA/waveOutGetErrorTextW +#endif MMRESULT qxewaveOutGetErrorText (MMRESULT mmrError, Extbyte * pszText, UINT cchText); + #undef waveInGetDevCaps #define waveInGetDevCaps error split-sized LPWAVEINCAPS + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef waveInGetErrorText +#define waveInGetErrorText error use qxewaveInGetErrorText or waveInGetErrorTextA/waveInGetErrorTextW +#endif MMRESULT qxewaveInGetErrorText (MMRESULT mmrError, Extbyte * pszText, UINT cchText); + #undef midiOutGetDevCaps #define midiOutGetDevCaps error split-sized LPMIDIOUTCAPS + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef midiOutGetErrorText +#define midiOutGetErrorText error use qxemidiOutGetErrorText or midiOutGetErrorTextA/midiOutGetErrorTextW +#endif MMRESULT qxemidiOutGetErrorText (MMRESULT mmrError, Extbyte * pszText, UINT cchText); + #undef midiInGetDevCaps #define midiInGetDevCaps error split-sized LPMIDIOUTCAPS + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef midiInGetErrorText +#define midiInGetErrorText error use qxemidiInGetErrorText or midiInGetErrorTextA/midiInGetErrorTextW +#endif MMRESULT qxemidiInGetErrorText (MMRESULT mmrError, Extbyte * pszText, UINT cchText); + #undef auxGetDevCaps #define auxGetDevCaps error split-sized LPAUXCAPS + #undef mixerGetDevCaps #define mixerGetDevCaps error split-sized LPMIXERCAPS + #undef mixerGetLineInfo #define mixerGetLineInfo error split-sized LPMIXERLINE + #undef mixerGetLineControls #define mixerGetLineControls error split-sized LPMIXERCONTROL + #undef mixerGetControlDetails #define mixerGetControlDetails error split-sized LPMIXERCONTROL in LPMIXERLINECONTROLS in LPMIXERCONTROLDETAILS + #undef joyGetDevCaps #define joyGetDevCaps error split-sized LPJOYCAPS + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef mmioStringToFOURCC +#define mmioStringToFOURCC error use qxemmioStringToFOURCC or mmioStringToFOURCCA/mmioStringToFOURCCW +#endif FOURCC qxemmioStringToFOURCC (const Extbyte * sz, UINT uFlags); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef mmioInstallIOProc +#define mmioInstallIOProc error use qxemmioInstallIOProc or mmioInstallIOProcA/mmioInstallIOProcW +#endif LPMMIOPROC qxemmioInstallIOProc (FOURCC fccIOProc, LPMMIOPROC pIOProc, DWORD dwFlags); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef mmioOpen +#define mmioOpen error use qxemmioOpen or mmioOpenA/mmioOpenW +#endif HMMIO qxemmioOpen (Extbyte * pszFileName, LPMMIOINFO pmmioinfo, DWORD fdwOpen); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef mmioRename +#define mmioRename error use qxemmioRename or mmioRenameA/mmioRenameW +#endif MMRESULT qxemmioRename (const Extbyte * pszFileName, const Extbyte * pszNewFileName, LPCMMIOINFO pmmioinfo, DWORD fdwRename); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef mciSendCommand +#define mciSendCommand error use qxemciSendCommand or mciSendCommandA/mciSendCommandW +#endif MCIERROR qxemciSendCommand (MCIDEVICEID mciId, UINT uMsg, DWORD dwParam1, DWORD dwParam2); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef mciSendString +#define mciSendString error use qxemciSendString or mciSendStringA/mciSendStringW +#endif MCIERROR qxemciSendString (const Extbyte * lpstrCommand, Extbyte * lpstrReturnString, UINT uReturnLength, HWND hwndCallback); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef mciGetDeviceID +#define mciGetDeviceID error use qxemciGetDeviceID or mciGetDeviceIDA/mciGetDeviceIDW +#endif MCIDEVICEID qxemciGetDeviceID (const Extbyte * pszDevice); + #if !defined (MINGW) #undef mciGetDeviceIDFromElementID #define mciGetDeviceIDFromElementID error missing from Win98se version of ADVAPI32.dll #endif /* !defined (MINGW) */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef mciGetErrorString +#define mciGetErrorString error use qxemciGetErrorString or mciGetErrorStringA/mciGetErrorStringW +#endif BOOL qxemciGetErrorString (MCIERROR mcierr, Extbyte * pszText, UINT cchText); + /* Processing file WINBASE.H */ +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetBinaryType +#define GetBinaryType error use qxeGetBinaryType or GetBinaryTypeA/GetBinaryTypeW +#endif BOOL qxeGetBinaryType (const Extbyte * lpApplicationName, LPDWORD lpBinaryType); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetShortPathName +#define GetShortPathName error use qxeGetShortPathName or GetShortPathNameA/GetShortPathNameW +#endif DWORD qxeGetShortPathName (const Extbyte * lpszLongPath, Extbyte * lpszShortPath, DWORD cchBuffer); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetLongPathName +#define GetLongPathName error use qxeGetLongPathName or GetLongPathNameA/GetLongPathNameW +#endif DWORD qxeGetLongPathName (const Extbyte * lpszShortPath, Extbyte * lpszLongPath, DWORD cchBuffer); -Extbyte * qxeGetEnvironmentStrings (void); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef FreeEnvironmentStrings +#define FreeEnvironmentStrings error use qxeFreeEnvironmentStrings or FreeEnvironmentStringsA/FreeEnvironmentStringsW +#endif BOOL qxeFreeEnvironmentStrings (Extbyte * arg1); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef FormatMessage +#define FormatMessage error use qxeFormatMessage or FormatMessageA/FormatMessageW +#endif DWORD qxeFormatMessage (DWORD dwFlags, LPCVOID lpSource, DWORD dwMessageId, DWORD dwLanguageId, Extbyte * lpBuffer, DWORD nSize, va_list * Arguments); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateMailslot +#define CreateMailslot error use qxeCreateMailslot or CreateMailslotA/CreateMailslotW +#endif HANDLE qxeCreateMailslot (const Extbyte * lpName, DWORD nMaxMessageSize, DWORD lReadTimeout, LPSECURITY_ATTRIBUTES lpSecurityAttributes); + #if !defined (CYGWIN_HEADERS) #undef EncryptFile #define EncryptFile error Win2K+ only #endif /* !defined (CYGWIN_HEADERS) */ + #if !defined (CYGWIN_HEADERS) #undef DecryptFile #define DecryptFile error Win2K+ only #endif /* !defined (CYGWIN_HEADERS) */ + #undef OpenRaw #define OpenRaw error error "The procedure entry point OpenRawW could not be located in the dynamic link library ADVAPI32.dll." + #undef QueryRecoveryAgents #define QueryRecoveryAgents error split-sized LPRECOVERY_AGENT_INFORMATION + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef lstrcmp +#define lstrcmp error use qxelstrcmp or lstrcmpA/lstrcmpW +#endif int qxelstrcmp (const Extbyte * lpString1, const Extbyte * lpString2); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef lstrcmpi +#define lstrcmpi error use qxelstrcmpi or lstrcmpiA/lstrcmpiW +#endif int qxelstrcmpi (const Extbyte * lpString1, const Extbyte * lpString2); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef lstrcpyn +#define lstrcpyn error use qxelstrcpyn or lstrcpynA/lstrcpynW +#endif Extbyte * qxelstrcpyn (Extbyte * lpString1, const Extbyte * lpString2, int iMaxLength); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef lstrcpy +#define lstrcpy error use qxelstrcpy or lstrcpyA/lstrcpyW +#endif Extbyte * qxelstrcpy (Extbyte * lpString1, const Extbyte * lpString2); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef lstrcat +#define lstrcat error use qxelstrcat or lstrcatA/lstrcatW +#endif Extbyte * qxelstrcat (Extbyte * lpString1, const Extbyte * lpString2); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef lstrlen +#define lstrlen error use qxelstrlen or lstrlenA/lstrlenW +#endif int qxelstrlen (const Extbyte * lpString); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateMutex +#define CreateMutex error use qxeCreateMutex or CreateMutexA/CreateMutexW +#endif HANDLE qxeCreateMutex (LPSECURITY_ATTRIBUTES lpMutexAttributes, BOOL bInitialOwner, const Extbyte * lpName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef OpenMutex +#define OpenMutex error use qxeOpenMutex or OpenMutexA/OpenMutexW +#endif HANDLE qxeOpenMutex (DWORD dwDesiredAccess, BOOL bInheritHandle, const Extbyte * lpName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateEvent +#define CreateEvent error use qxeCreateEvent or CreateEventA/CreateEventW +#endif HANDLE qxeCreateEvent (LPSECURITY_ATTRIBUTES lpEventAttributes, BOOL bManualReset, BOOL bInitialState, const Extbyte * lpName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef OpenEvent +#define OpenEvent error use qxeOpenEvent or OpenEventA/OpenEventW +#endif HANDLE qxeOpenEvent (DWORD dwDesiredAccess, BOOL bInheritHandle, const Extbyte * lpName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateSemaphore +#define CreateSemaphore error use qxeCreateSemaphore or CreateSemaphoreA/CreateSemaphoreW +#endif HANDLE qxeCreateSemaphore (LPSECURITY_ATTRIBUTES lpSemaphoreAttributes, LONG lInitialCount, LONG lMaximumCount, const Extbyte * lpName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef OpenSemaphore +#define OpenSemaphore error use qxeOpenSemaphore or OpenSemaphoreA/OpenSemaphoreW +#endif HANDLE qxeOpenSemaphore (DWORD dwDesiredAccess, BOOL bInheritHandle, const Extbyte * lpName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateWaitableTimer +#define CreateWaitableTimer error use qxeCreateWaitableTimer or CreateWaitableTimerA/CreateWaitableTimerW +#endif HANDLE qxeCreateWaitableTimer (LPSECURITY_ATTRIBUTES lpTimerAttributes, BOOL bManualReset, const Extbyte * lpTimerName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef OpenWaitableTimer +#define OpenWaitableTimer error use qxeOpenWaitableTimer or OpenWaitableTimerA/OpenWaitableTimerW +#endif HANDLE qxeOpenWaitableTimer (DWORD dwDesiredAccess, BOOL bInheritHandle, const Extbyte * lpTimerName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateFileMapping +#define CreateFileMapping error use qxeCreateFileMapping or CreateFileMappingA/CreateFileMappingW +#endif HANDLE qxeCreateFileMapping (HANDLE hFile, LPSECURITY_ATTRIBUTES lpFileMappingAttributes, DWORD flProtect, DWORD dwMaximumSizeHigh, DWORD dwMaximumSizeLow, const Extbyte * lpName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef OpenFileMapping +#define OpenFileMapping error use qxeOpenFileMapping or OpenFileMappingA/OpenFileMappingW +#endif HANDLE qxeOpenFileMapping (DWORD dwDesiredAccess, BOOL bInheritHandle, const Extbyte * lpName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetLogicalDriveStrings +#define GetLogicalDriveStrings error use qxeGetLogicalDriveStrings or GetLogicalDriveStringsA/GetLogicalDriveStringsW +#endif DWORD qxeGetLogicalDriveStrings (DWORD nBufferLength, Extbyte * lpBuffer); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LoadLibrary +#define LoadLibrary error use qxeLoadLibrary or LoadLibraryA/LoadLibraryW +#endif HMODULE qxeLoadLibrary (const Extbyte * lpLibFileName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LoadLibraryEx +#define LoadLibraryEx error use qxeLoadLibraryEx or LoadLibraryExA/LoadLibraryExW +#endif HMODULE qxeLoadLibraryEx (const Extbyte * lpLibFileName, HANDLE hFile, DWORD dwFlags); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetModuleFileName +#define GetModuleFileName error use qxeGetModuleFileName or GetModuleFileNameA/GetModuleFileNameW +#endif DWORD qxeGetModuleFileName (HMODULE hModule, Extbyte * lpFilename, DWORD nSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetModuleHandle +#define GetModuleHandle error use qxeGetModuleHandle or GetModuleHandleA/GetModuleHandleW +#endif HMODULE qxeGetModuleHandle (const Extbyte * lpModuleName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateProcess +#define CreateProcess error use qxeCreateProcess or CreateProcessA/CreateProcessW +#endif BOOL qxeCreateProcess (const Extbyte * lpApplicationName, Extbyte * lpCommandLine, LPSECURITY_ATTRIBUTES lpProcessAttributes, LPSECURITY_ATTRIBUTES lpThreadAttributes, BOOL bInheritHandles, DWORD dwCreationFlags, LPVOID lpEnvironment, const Extbyte * lpCurrentDirectory, LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef FatalAppExit +#define FatalAppExit error use qxeFatalAppExit or FatalAppExitA/FatalAppExitW +#endif VOID qxeFatalAppExit (UINT uAction, const Extbyte * lpMessageText); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetStartupInfo +#define GetStartupInfo error use qxeGetStartupInfo or GetStartupInfoA/GetStartupInfoW +#endif VOID qxeGetStartupInfo (LPSTARTUPINFOW lpStartupInfo); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetCommandLine +#define GetCommandLine error use qxeGetCommandLine or GetCommandLineA/GetCommandLineW +#endif Extbyte * qxeGetCommandLine (void); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetEnvironmentVariable +#define GetEnvironmentVariable error use qxeGetEnvironmentVariable or GetEnvironmentVariableA/GetEnvironmentVariableW +#endif DWORD qxeGetEnvironmentVariable (const Extbyte * lpName, Extbyte * lpBuffer, DWORD nSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetEnvironmentVariable +#define SetEnvironmentVariable error use qxeSetEnvironmentVariable or SetEnvironmentVariableA/SetEnvironmentVariableW +#endif BOOL qxeSetEnvironmentVariable (const Extbyte * lpName, const Extbyte * lpValue); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ExpandEnvironmentStrings +#define ExpandEnvironmentStrings error use qxeExpandEnvironmentStrings or ExpandEnvironmentStringsA/ExpandEnvironmentStringsW +#endif DWORD qxeExpandEnvironmentStrings (const Extbyte * lpSrc, Extbyte * lpDst, DWORD nSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef OutputDebugString +#define OutputDebugString error use qxeOutputDebugString or OutputDebugStringA/OutputDebugStringW +#endif VOID qxeOutputDebugString (const Extbyte * lpOutputString); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef FindResource +#define FindResource error use qxeFindResource or FindResourceA/FindResourceW +#endif HRSRC qxeFindResource (HMODULE hModule, const Extbyte * lpName, const Extbyte * lpType); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef FindResourceEx +#define FindResourceEx error use qxeFindResourceEx or FindResourceExA/FindResourceExW +#endif HRSRC qxeFindResourceEx (HMODULE hModule, const Extbyte * lpType, const Extbyte * lpName, WORD wLanguage); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef EnumResourceTypes +#define EnumResourceTypes error use qxeEnumResourceTypes or EnumResourceTypesA/EnumResourceTypesW +#endif BOOL qxeEnumResourceTypes (HMODULE hModule, ENUMRESTYPEPROC lpEnumFunc, LONG lParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef EnumResourceNames +#define EnumResourceNames error use qxeEnumResourceNames or EnumResourceNamesA/EnumResourceNamesW +#endif BOOL qxeEnumResourceNames (HMODULE hModule, const Extbyte * lpType, ENUMRESNAMEPROC lpEnumFunc, LONG lParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef EnumResourceLanguages +#define EnumResourceLanguages error use qxeEnumResourceLanguages or EnumResourceLanguagesA/EnumResourceLanguagesW +#endif BOOL qxeEnumResourceLanguages (HMODULE hModule, const Extbyte * lpType, const Extbyte * lpName, ENUMRESLANGPROC lpEnumFunc, LONG lParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef BeginUpdateResource +#define BeginUpdateResource error use qxeBeginUpdateResource or BeginUpdateResourceA/BeginUpdateResourceW +#endif HANDLE qxeBeginUpdateResource (const Extbyte * pFileName, BOOL bDeleteExistingResources); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef UpdateResource +#define UpdateResource error use qxeUpdateResource or UpdateResourceA/UpdateResourceW +#endif BOOL qxeUpdateResource (HANDLE hUpdate, const Extbyte * lpType, const Extbyte * lpName, WORD wLanguage, LPVOID lpData, DWORD cbData); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef EndUpdateResource +#define EndUpdateResource error use qxeEndUpdateResource or EndUpdateResourceA/EndUpdateResourceW +#endif BOOL qxeEndUpdateResource (HANDLE hUpdate, BOOL fDiscard); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GlobalAddAtom +#define GlobalAddAtom error use qxeGlobalAddAtom or GlobalAddAtomA/GlobalAddAtomW +#endif ATOM qxeGlobalAddAtom (const Extbyte * lpString); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GlobalFindAtom +#define GlobalFindAtom error use qxeGlobalFindAtom or GlobalFindAtomA/GlobalFindAtomW +#endif ATOM qxeGlobalFindAtom (const Extbyte * lpString); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GlobalGetAtomName +#define GlobalGetAtomName error use qxeGlobalGetAtomName or GlobalGetAtomNameA/GlobalGetAtomNameW +#endif UINT qxeGlobalGetAtomName (ATOM nAtom, Extbyte * lpBuffer, int nSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef AddAtom +#define AddAtom error use qxeAddAtom or AddAtomA/AddAtomW +#endif ATOM qxeAddAtom (const Extbyte * lpString); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef FindAtom +#define FindAtom error use qxeFindAtom or FindAtomA/FindAtomW +#endif ATOM qxeFindAtom (const Extbyte * lpString); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetAtomName +#define GetAtomName error use qxeGetAtomName or GetAtomNameA/GetAtomNameW +#endif UINT qxeGetAtomName (ATOM nAtom, Extbyte * lpBuffer, int nSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetProfileInt +#define GetProfileInt error use qxeGetProfileInt or GetProfileIntA/GetProfileIntW +#endif UINT qxeGetProfileInt (const Extbyte * lpAppName, const Extbyte * lpKeyName, INT nDefault); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetProfileString +#define GetProfileString error use qxeGetProfileString or GetProfileStringA/GetProfileStringW +#endif DWORD qxeGetProfileString (const Extbyte * lpAppName, const Extbyte * lpKeyName, const Extbyte * lpDefault, Extbyte * lpReturnedString, DWORD nSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WriteProfileString +#define WriteProfileString error use qxeWriteProfileString or WriteProfileStringA/WriteProfileStringW +#endif BOOL qxeWriteProfileString (const Extbyte * lpAppName, const Extbyte * lpKeyName, const Extbyte * lpString); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetProfileSection +#define GetProfileSection error use qxeGetProfileSection or GetProfileSectionA/GetProfileSectionW +#endif DWORD qxeGetProfileSection (const Extbyte * lpAppName, Extbyte * lpReturnedString, DWORD nSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WriteProfileSection +#define WriteProfileSection error use qxeWriteProfileSection or WriteProfileSectionA/WriteProfileSectionW +#endif BOOL qxeWriteProfileSection (const Extbyte * lpAppName, const Extbyte * lpString); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetPrivateProfileInt +#define GetPrivateProfileInt error use qxeGetPrivateProfileInt or GetPrivateProfileIntA/GetPrivateProfileIntW +#endif UINT qxeGetPrivateProfileInt (const Extbyte * lpAppName, const Extbyte * lpKeyName, INT nDefault, const Extbyte * lpFileName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetPrivateProfileString +#define GetPrivateProfileString error use qxeGetPrivateProfileString or GetPrivateProfileStringA/GetPrivateProfileStringW +#endif DWORD qxeGetPrivateProfileString (const Extbyte * lpAppName, const Extbyte * lpKeyName, const Extbyte * lpDefault, Extbyte * lpReturnedString, DWORD nSize, const Extbyte * lpFileName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WritePrivateProfileString +#define WritePrivateProfileString error use qxeWritePrivateProfileString or WritePrivateProfileStringA/WritePrivateProfileStringW +#endif BOOL qxeWritePrivateProfileString (const Extbyte * lpAppName, const Extbyte * lpKeyName, const Extbyte * lpString, const Extbyte * lpFileName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetPrivateProfileSection +#define GetPrivateProfileSection error use qxeGetPrivateProfileSection or GetPrivateProfileSectionA/GetPrivateProfileSectionW +#endif DWORD qxeGetPrivateProfileSection (const Extbyte * lpAppName, Extbyte * lpReturnedString, DWORD nSize, const Extbyte * lpFileName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WritePrivateProfileSection +#define WritePrivateProfileSection error use qxeWritePrivateProfileSection or WritePrivateProfileSectionA/WritePrivateProfileSectionW +#endif BOOL qxeWritePrivateProfileSection (const Extbyte * lpAppName, const Extbyte * lpString, const Extbyte * lpFileName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetPrivateProfileSectionNames +#define GetPrivateProfileSectionNames error use qxeGetPrivateProfileSectionNames or GetPrivateProfileSectionNamesA/GetPrivateProfileSectionNamesW +#endif DWORD qxeGetPrivateProfileSectionNames (Extbyte * lpszReturnBuffer, DWORD nSize, const Extbyte * lpFileName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetPrivateProfileStruct +#define GetPrivateProfileStruct error use qxeGetPrivateProfileStruct or GetPrivateProfileStructA/GetPrivateProfileStructW +#endif BOOL qxeGetPrivateProfileStruct (const Extbyte * lpszSection, const Extbyte * lpszKey, LPVOID lpStruct, UINT uSizeStruct, const Extbyte * szFile); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WritePrivateProfileStruct +#define WritePrivateProfileStruct error use qxeWritePrivateProfileStruct or WritePrivateProfileStructA/WritePrivateProfileStructW +#endif BOOL qxeWritePrivateProfileStruct (const Extbyte * lpszSection, const Extbyte * lpszKey, LPVOID lpStruct, UINT uSizeStruct, const Extbyte * szFile); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetDriveType +#define GetDriveType error use qxeGetDriveType or GetDriveTypeA/GetDriveTypeW +#endif UINT qxeGetDriveType (const Extbyte * lpRootPathName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetSystemDirectory +#define GetSystemDirectory error use qxeGetSystemDirectory or GetSystemDirectoryA/GetSystemDirectoryW +#endif UINT qxeGetSystemDirectory (Extbyte * lpBuffer, UINT uSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetTempPath +#define GetTempPath error use qxeGetTempPath or GetTempPathA/GetTempPathW +#endif DWORD qxeGetTempPath (DWORD nBufferLength, Extbyte * lpBuffer); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetTempFileName +#define GetTempFileName error use qxeGetTempFileName or GetTempFileNameA/GetTempFileNameW +#endif UINT qxeGetTempFileName (const Extbyte * lpPathName, const Extbyte * lpPrefixString, UINT uUnique, Extbyte * lpTempFileName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetWindowsDirectory +#define GetWindowsDirectory error use qxeGetWindowsDirectory or GetWindowsDirectoryA/GetWindowsDirectoryW +#endif UINT qxeGetWindowsDirectory (Extbyte * lpBuffer, UINT uSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetCurrentDirectory +#define SetCurrentDirectory error use qxeSetCurrentDirectory or SetCurrentDirectoryA/SetCurrentDirectoryW +#endif BOOL qxeSetCurrentDirectory (const Extbyte * lpPathName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetCurrentDirectory +#define GetCurrentDirectory error use qxeGetCurrentDirectory or GetCurrentDirectoryA/GetCurrentDirectoryW +#endif DWORD qxeGetCurrentDirectory (DWORD nBufferLength, Extbyte * lpBuffer); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetDiskFreeSpace +#define GetDiskFreeSpace error use qxeGetDiskFreeSpace or GetDiskFreeSpaceA/GetDiskFreeSpaceW +#endif BOOL qxeGetDiskFreeSpace (const Extbyte * lpRootPathName, LPDWORD lpSectorsPerCluster, LPDWORD lpBytesPerSector, LPDWORD lpNumberOfFreeClusters, LPDWORD lpTotalNumberOfClusters); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetDiskFreeSpaceEx +#define GetDiskFreeSpaceEx error use qxeGetDiskFreeSpaceEx or GetDiskFreeSpaceExA/GetDiskFreeSpaceExW +#endif BOOL qxeGetDiskFreeSpaceEx (const Extbyte * lpDirectoryName, PULARGE_INTEGER lpFreeBytesAvailableToCaller, PULARGE_INTEGER lpTotalNumberOfBytes, PULARGE_INTEGER lpTotalNumberOfFreeBytes); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateDirectory +#define CreateDirectory error use qxeCreateDirectory or CreateDirectoryA/CreateDirectoryW +#endif BOOL qxeCreateDirectory (const Extbyte * lpPathName, LPSECURITY_ATTRIBUTES lpSecurityAttributes); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateDirectoryEx +#define CreateDirectoryEx error use qxeCreateDirectoryEx or CreateDirectoryExA/CreateDirectoryExW +#endif BOOL qxeCreateDirectoryEx (const Extbyte * lpTemplateDirectory, const Extbyte * lpNewDirectory, LPSECURITY_ATTRIBUTES lpSecurityAttributes); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RemoveDirectory +#define RemoveDirectory error use qxeRemoveDirectory or RemoveDirectoryA/RemoveDirectoryW +#endif BOOL qxeRemoveDirectory (const Extbyte * lpPathName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetFullPathName +#define GetFullPathName error use qxeGetFullPathName or GetFullPathNameA/GetFullPathNameW +#endif DWORD qxeGetFullPathName (const Extbyte * lpFileName, DWORD nBufferLength, Extbyte * lpBuffer, Extbyte * * lpFilePart); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DefineDosDevice +#define DefineDosDevice error use qxeDefineDosDevice or DefineDosDeviceA/DefineDosDeviceW +#endif BOOL qxeDefineDosDevice (DWORD dwFlags, const Extbyte * lpDeviceName, const Extbyte * lpTargetPath); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef QueryDosDevice +#define QueryDosDevice error use qxeQueryDosDevice or QueryDosDeviceA/QueryDosDeviceW +#endif DWORD qxeQueryDosDevice (const Extbyte * lpDeviceName, Extbyte * lpTargetPath, DWORD ucchMax); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateFile +#define CreateFile error use qxeCreateFile or CreateFileA/CreateFileW +#endif HANDLE qxeCreateFile (const Extbyte * lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetFileAttributes +#define SetFileAttributes error use qxeSetFileAttributes or SetFileAttributesA/SetFileAttributesW +#endif BOOL qxeSetFileAttributes (const Extbyte * lpFileName, DWORD dwFileAttributes); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetFileAttributes +#define GetFileAttributes error use qxeGetFileAttributes or GetFileAttributesA/GetFileAttributesW +#endif DWORD qxeGetFileAttributes (const Extbyte * lpFileName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetFileAttributesEx +#define GetFileAttributesEx error use qxeGetFileAttributesEx or GetFileAttributesExA/GetFileAttributesExW +#endif BOOL qxeGetFileAttributesEx (const Extbyte * lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId, LPVOID lpFileInformation); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetCompressedFileSize +#define GetCompressedFileSize error use qxeGetCompressedFileSize or GetCompressedFileSizeA/GetCompressedFileSizeW +#endif DWORD qxeGetCompressedFileSize (const Extbyte * lpFileName, LPDWORD lpFileSizeHigh); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DeleteFile +#define DeleteFile error use qxeDeleteFile or DeleteFileA/DeleteFileW +#endif BOOL qxeDeleteFile (const Extbyte * lpFileName); + #undef FindFirstFileEx #define FindFirstFileEx error split-sized LPWIN32_FIND_DATA; not used, NT 4.0+ only + /* Skipping FindFirstFile because split-sized LPWIN32_FIND_DATA */ + /* Skipping FindNextFile because split-sized LPWIN32_FIND_DATA */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SearchPath +#define SearchPath error use qxeSearchPath or SearchPathA/SearchPathW +#endif DWORD qxeSearchPath (const Extbyte * lpPath, const Extbyte * lpFileName, const Extbyte * lpExtension, DWORD nBufferLength, Extbyte * lpBuffer, Extbyte * * lpFilePart); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CopyFile +#define CopyFile error use qxeCopyFile or CopyFileA/CopyFileW +#endif BOOL qxeCopyFile (const Extbyte * lpExistingFileName, const Extbyte * lpNewFileName, BOOL bFailIfExists); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CopyFileEx +#define CopyFileEx error use qxeCopyFileEx or CopyFileExA/CopyFileExW +#endif BOOL qxeCopyFileEx (const Extbyte * lpExistingFileName, const Extbyte * lpNewFileName, LPPROGRESS_ROUTINE lpProgressRoutine, LPVOID lpData, LPBOOL pbCancel, DWORD dwCopyFlags); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef MoveFile +#define MoveFile error use qxeMoveFile or MoveFileA/MoveFileW +#endif BOOL qxeMoveFile (const Extbyte * lpExistingFileName, const Extbyte * lpNewFileName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef MoveFileEx +#define MoveFileEx error use qxeMoveFileEx or MoveFileExA/MoveFileExW +#endif BOOL qxeMoveFileEx (const Extbyte * lpExistingFileName, const Extbyte * lpNewFileName, DWORD dwFlags); + #undef MoveFileWithProgress #define MoveFileWithProgress error NT 5.0+ only + #undef CreateHardLink #define CreateHardLink error NT 5.0+ only + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateNamedPipe +#define CreateNamedPipe error use qxeCreateNamedPipe or CreateNamedPipeA/CreateNamedPipeW +#endif HANDLE qxeCreateNamedPipe (const Extbyte * lpName, DWORD dwOpenMode, DWORD dwPipeMode, DWORD nMaxInstances, DWORD nOutBufferSize, DWORD nInBufferSize, DWORD nDefaultTimeOut, LPSECURITY_ATTRIBUTES lpSecurityAttributes); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetNamedPipeHandleState +#define GetNamedPipeHandleState error use qxeGetNamedPipeHandleState or GetNamedPipeHandleStateA/GetNamedPipeHandleStateW +#endif BOOL qxeGetNamedPipeHandleState (HANDLE hNamedPipe, LPDWORD lpState, LPDWORD lpCurInstances, LPDWORD lpMaxCollectionCount, LPDWORD lpCollectDataTimeout, Extbyte * lpUserName, DWORD nMaxUserNameSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CallNamedPipe +#define CallNamedPipe error use qxeCallNamedPipe or CallNamedPipeA/CallNamedPipeW +#endif BOOL qxeCallNamedPipe (const Extbyte * lpNamedPipeName, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesRead, DWORD nTimeOut); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef WaitNamedPipe +#define WaitNamedPipe error use qxeWaitNamedPipe or WaitNamedPipeA/WaitNamedPipeW +#endif BOOL qxeWaitNamedPipe (const Extbyte * lpNamedPipeName, DWORD nTimeOut); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetVolumeLabel +#define SetVolumeLabel error use qxeSetVolumeLabel or SetVolumeLabelA/SetVolumeLabelW +#endif BOOL qxeSetVolumeLabel (const Extbyte * lpRootPathName, const Extbyte * lpVolumeName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetVolumeInformation +#define GetVolumeInformation error use qxeGetVolumeInformation or GetVolumeInformationA/GetVolumeInformationW +#endif BOOL qxeGetVolumeInformation (const Extbyte * lpRootPathName, Extbyte * lpVolumeNameBuffer, DWORD nVolumeNameSize, LPDWORD lpVolumeSerialNumber, LPDWORD lpMaximumComponentLength, LPDWORD lpFileSystemFlags, Extbyte * lpFileSystemNameBuffer, DWORD nFileSystemNameSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ClearEventLog +#define ClearEventLog error use qxeClearEventLog or ClearEventLogA/ClearEventLogW +#endif BOOL qxeClearEventLog (HANDLE hEventLog, const Extbyte * lpBackupFileName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef BackupEventLog +#define BackupEventLog error use qxeBackupEventLog or BackupEventLogA/BackupEventLogW +#endif BOOL qxeBackupEventLog (HANDLE hEventLog, const Extbyte * lpBackupFileName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef OpenEventLog +#define OpenEventLog error use qxeOpenEventLog or OpenEventLogA/OpenEventLogW +#endif HANDLE qxeOpenEventLog (const Extbyte * lpUNCServerName, const Extbyte * lpSourceName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegisterEventSource +#define RegisterEventSource error use qxeRegisterEventSource or RegisterEventSourceA/RegisterEventSourceW +#endif HANDLE qxeRegisterEventSource (const Extbyte * lpUNCServerName, const Extbyte * lpSourceName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef OpenBackupEventLog +#define OpenBackupEventLog error use qxeOpenBackupEventLog or OpenBackupEventLogA/OpenBackupEventLogW +#endif HANDLE qxeOpenBackupEventLog (const Extbyte * lpUNCServerName, const Extbyte * lpFileName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ReadEventLog +#define ReadEventLog error use qxeReadEventLog or ReadEventLogA/ReadEventLogW +#endif BOOL qxeReadEventLog (HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOffset, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, DWORD * pnBytesRead, DWORD * pnMinNumberOfBytesNeeded); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ReportEvent +#define ReportEvent error use qxeReportEvent or ReportEventA/ReportEventW +#endif BOOL qxeReportEvent (HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dwEventID, PSID lpUserSid, WORD wNumStrings, DWORD dwDataSize, const Extbyte * * lpStrings, LPVOID lpRawData); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef AccessCheckAndAuditAlarm +#define AccessCheckAndAuditAlarm error use qxeAccessCheckAndAuditAlarm or AccessCheckAndAuditAlarmA/AccessCheckAndAuditAlarmW +#endif BOOL qxeAccessCheckAndAuditAlarm (const Extbyte * SubsystemName, LPVOID HandleId, Extbyte * ObjectTypeName, Extbyte * ObjectName, PSECURITY_DESCRIPTOR SecurityDescriptor, DWORD DesiredAccess, PGENERIC_MAPPING GenericMapping, BOOL ObjectCreation, LPDWORD GrantedAccess, LPBOOL AccessStatus, LPBOOL pfGenerateOnClose); + #undef AccessCheckByTypeAndAuditAlarm #define AccessCheckByTypeAndAuditAlarm error NT 5.0+ only + #undef AccessCheckByTypeResultListAndAuditAlarm #define AccessCheckByTypeResultListAndAuditAlarm error NT 5.0+ only + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ObjectOpenAuditAlarm +#define ObjectOpenAuditAlarm error use qxeObjectOpenAuditAlarm or ObjectOpenAuditAlarmA/ObjectOpenAuditAlarmW +#endif BOOL qxeObjectOpenAuditAlarm (const Extbyte * SubsystemName, LPVOID HandleId, Extbyte * ObjectTypeName, Extbyte * ObjectName, PSECURITY_DESCRIPTOR pSecurityDescriptor, HANDLE ClientToken, DWORD DesiredAccess, DWORD GrantedAccess, PPRIVILEGE_SET Privileges, BOOL ObjectCreation, BOOL AccessGranted, LPBOOL GenerateOnClose); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ObjectPrivilegeAuditAlarm +#define ObjectPrivilegeAuditAlarm error use qxeObjectPrivilegeAuditAlarm or ObjectPrivilegeAuditAlarmA/ObjectPrivilegeAuditAlarmW +#endif BOOL qxeObjectPrivilegeAuditAlarm (const Extbyte * SubsystemName, LPVOID HandleId, HANDLE ClientToken, DWORD DesiredAccess, PPRIVILEGE_SET Privileges, BOOL AccessGranted); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ObjectCloseAuditAlarm +#define ObjectCloseAuditAlarm error use qxeObjectCloseAuditAlarm or ObjectCloseAuditAlarmA/ObjectCloseAuditAlarmW +#endif BOOL qxeObjectCloseAuditAlarm (const Extbyte * SubsystemName, LPVOID HandleId, BOOL GenerateOnClose); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ObjectDeleteAuditAlarm +#define ObjectDeleteAuditAlarm error use qxeObjectDeleteAuditAlarm or ObjectDeleteAuditAlarmA/ObjectDeleteAuditAlarmW +#endif BOOL qxeObjectDeleteAuditAlarm (const Extbyte * SubsystemName, LPVOID HandleId, BOOL GenerateOnClose); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef PrivilegedServiceAuditAlarm +#define PrivilegedServiceAuditAlarm error use qxePrivilegedServiceAuditAlarm or PrivilegedServiceAuditAlarmA/PrivilegedServiceAuditAlarmW +#endif BOOL qxePrivilegedServiceAuditAlarm (const Extbyte * SubsystemName, const Extbyte * ServiceName, HANDLE ClientToken, PPRIVILEGE_SET Privileges, BOOL AccessGranted); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetFileSecurity +#define SetFileSecurity error use qxeSetFileSecurity or SetFileSecurityA/SetFileSecurityW +#endif BOOL qxeSetFileSecurity (const Extbyte * lpFileName, SECURITY_INFORMATION SecurityInformation, PSECURITY_DESCRIPTOR pSecurityDescriptor); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetFileSecurity +#define GetFileSecurity error use qxeGetFileSecurity or GetFileSecurityA/GetFileSecurityW +#endif BOOL qxeGetFileSecurity (const Extbyte * lpFileName, SECURITY_INFORMATION RequestedInformation, PSECURITY_DESCRIPTOR pSecurityDescriptor, DWORD nLength, LPDWORD lpnLengthNeeded); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef FindFirstChangeNotification +#define FindFirstChangeNotification error use qxeFindFirstChangeNotification or FindFirstChangeNotificationA/FindFirstChangeNotificationW +#endif HANDLE qxeFindFirstChangeNotification (const Extbyte * lpPathName, BOOL bWatchSubtree, DWORD dwNotifyFilter); + #undef ReadDirectoryChanges #define ReadDirectoryChanges error Unicode-only + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef IsBadStringPtr +#define IsBadStringPtr error use qxeIsBadStringPtr or IsBadStringPtrA/IsBadStringPtrW +#endif BOOL qxeIsBadStringPtr (const Extbyte * lpsz, UINT ucchMax); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LookupAccountSid +#define LookupAccountSid error use qxeLookupAccountSid or LookupAccountSidA/LookupAccountSidW +#endif BOOL qxeLookupAccountSid (const Extbyte * lpSystemName, PSID Sid, Extbyte * Name, LPDWORD cbName, Extbyte * ReferencedDomainName, LPDWORD cbReferencedDomainName, PSID_NAME_USE peUse); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LookupAccountName +#define LookupAccountName error use qxeLookupAccountName or LookupAccountNameA/LookupAccountNameW +#endif BOOL qxeLookupAccountName (const Extbyte * lpSystemName, const Extbyte * lpAccountName, PSID Sid, LPDWORD cbSid, Extbyte * ReferencedDomainName, LPDWORD cbReferencedDomainName, PSID_NAME_USE peUse); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LookupPrivilegeValue +#define LookupPrivilegeValue error use qxeLookupPrivilegeValue or LookupPrivilegeValueA/LookupPrivilegeValueW +#endif BOOL qxeLookupPrivilegeValue (const Extbyte * lpSystemName, const Extbyte * lpName, PLUID lpLuid); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LookupPrivilegeName +#define LookupPrivilegeName error use qxeLookupPrivilegeName or LookupPrivilegeNameA/LookupPrivilegeNameW +#endif BOOL qxeLookupPrivilegeName (const Extbyte * lpSystemName, PLUID lpLuid, Extbyte * lpName, LPDWORD cbName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LookupPrivilegeDisplayName +#define LookupPrivilegeDisplayName error use qxeLookupPrivilegeDisplayName or LookupPrivilegeDisplayNameA/LookupPrivilegeDisplayNameW +#endif BOOL qxeLookupPrivilegeDisplayName (const Extbyte * lpSystemName, const Extbyte * lpName, Extbyte * lpDisplayName, LPDWORD cbDisplayName, LPDWORD lpLanguageId); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef BuildCommDCB +#define BuildCommDCB error use qxeBuildCommDCB or BuildCommDCBA/BuildCommDCBW +#endif BOOL qxeBuildCommDCB (const Extbyte * lpDef, LPDCB lpDCB); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef BuildCommDCBAndTimeouts +#define BuildCommDCBAndTimeouts error use qxeBuildCommDCBAndTimeouts or BuildCommDCBAndTimeoutsA/BuildCommDCBAndTimeoutsW +#endif BOOL qxeBuildCommDCBAndTimeouts (const Extbyte * lpDef, LPDCB lpDCB, LPCOMMTIMEOUTS lpCommTimeouts); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CommConfigDialog +#define CommConfigDialog error use qxeCommConfigDialog or CommConfigDialogA/CommConfigDialogW +#endif BOOL qxeCommConfigDialog (const Extbyte * lpszName, HWND hWnd, LPCOMMCONFIG lpCC); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetDefaultCommConfig +#define GetDefaultCommConfig error use qxeGetDefaultCommConfig or GetDefaultCommConfigA/GetDefaultCommConfigW +#endif BOOL qxeGetDefaultCommConfig (const Extbyte * lpszName, LPCOMMCONFIG lpCC, LPDWORD lpdwSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetDefaultCommConfig +#define SetDefaultCommConfig error use qxeSetDefaultCommConfig or SetDefaultCommConfigA/SetDefaultCommConfigW +#endif BOOL qxeSetDefaultCommConfig (const Extbyte * lpszName, LPCOMMCONFIG lpCC, DWORD dwSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetComputerName +#define GetComputerName error use qxeGetComputerName or GetComputerNameA/GetComputerNameW +#endif BOOL qxeGetComputerName (Extbyte * lpBuffer, LPDWORD nSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetComputerName +#define SetComputerName error use qxeSetComputerName or SetComputerNameA/SetComputerNameW +#endif BOOL qxeSetComputerName (const Extbyte * lpComputerName); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetUserName +#define GetUserName error use qxeGetUserName or GetUserNameA/GetUserNameW +#endif BOOL qxeGetUserName (Extbyte * lpBuffer, LPDWORD nSize); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef LogonUser +#define LogonUser error use qxeLogonUser or LogonUserA/LogonUserW +#endif BOOL qxeLogonUser (Extbyte * lpszUsername, Extbyte * lpszDomain, Extbyte * lpszPassword, DWORD dwLogonType, DWORD dwLogonProvider, PHANDLE phToken); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateProcessAsUser +#define CreateProcessAsUser error use qxeCreateProcessAsUser or CreateProcessAsUserA/CreateProcessAsUserW +#endif BOOL qxeCreateProcessAsUser (HANDLE hToken, const Extbyte * lpApplicationName, Extbyte * lpCommandLine, LPSECURITY_ATTRIBUTES lpProcessAttributes, LPSECURITY_ATTRIBUTES lpThreadAttributes, BOOL bInheritHandles, DWORD dwCreationFlags, LPVOID lpEnvironment, const Extbyte * lpCurrentDirectory, LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation); + #undef GetCurrentHwProfile #define GetCurrentHwProfile error split-sized LPHW_PROFILE_INFO; NT 4.0+ only + #undef GetVersionEx #define GetVersionEx error split-sized LPOSVERSIONINFO + #undef CreateJobObject #define CreateJobObject error NT 5.0+ only + #undef OpenJobObject #define OpenJobObject error NT 5.0+ only + /* Processing file COMMDLG.H */ +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetOpenFileName +#define GetOpenFileName error use qxeGetOpenFileName or GetOpenFileNameA/GetOpenFileNameW +#endif BOOL qxeGetOpenFileName (LPOPENFILENAMEW arg1); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetSaveFileName +#define GetSaveFileName error use qxeGetSaveFileName or GetSaveFileNameA/GetSaveFileNameW +#endif BOOL qxeGetSaveFileName (LPOPENFILENAMEW arg1); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetFileTitle +#define GetFileTitle error use qxeGetFileTitle or GetFileTitleA/GetFileTitleW +#endif short qxeGetFileTitle (const Extbyte * arg1, Extbyte * arg2, WORD arg3); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ChooseColor +#define ChooseColor error use qxeChooseColor or ChooseColorA/ChooseColorW +#endif BOOL qxeChooseColor (LPCHOOSECOLORW arg1); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef FindText +#define FindText error use qxeFindText or FindTextA/FindTextW +#endif HWND qxeFindText (LPFINDREPLACEW arg1); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ReplaceText +#define ReplaceText error use qxeReplaceText or ReplaceTextA/ReplaceTextW +#endif HWND qxeReplaceText (LPFINDREPLACEW arg1); + #undef AfxReplaceText #define AfxReplaceText error mac only + #undef ChooseFont #define ChooseFont error split-sized LPLOGFONT in LPCHOOSEFONT + /* Skipping PrintDlg because LPPRINTDLG with split-sized DEVMODE handle */ + /* Skipping PageSetupDlg because LPPAGESETUPDLG with split-sized DEVMODE handle */ + /* Processing file SHLOBJ.H */ +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SHGetPathFromIDList +#define SHGetPathFromIDList error use qxeSHGetPathFromIDList or SHGetPathFromIDListA/SHGetPathFromIDListW +#endif BOOL qxeSHGetPathFromIDList (LPCITEMIDLIST pidl, Extbyte * pszPath); + /* Skipping SHGetSpecialFolderPath because error in Cygwin prototype, missing from Cygwin libraries */ + /* Skipping SHBrowseForFolder because need to intercept callback for SendMessage */ + /* Skipping SHGetDataFromIDList because split-sized WIN32_FIND_DATA or split-simple NETRESOURCE, missing from Cygwin libraries */ + /* Processing file IME.H */ #undef SendIMEMessageEx #define SendIMEMessageEx error obsolete, no docs available + /* Processing file WINGDI.H */ +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef AddFontResource +#define AddFontResource error use qxeAddFontResource or AddFontResourceA/AddFontResourceW +#endif int qxeAddFontResource (const Extbyte * arg1); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CopyMetaFile +#define CopyMetaFile error use qxeCopyMetaFile or CopyMetaFileA/CopyMetaFileW +#endif HMETAFILE qxeCopyMetaFile (HMETAFILE arg1, const Extbyte * arg2); + /* Skipping CreateDC because split-sized DEVMODE */ + /* Skipping CreateFontIndirect because split-sized LOGFONT */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateFont +#define CreateFont error use qxeCreateFont or CreateFontA/CreateFontW +#endif HFONT qxeCreateFont (int arg1, int arg2, int arg3, int arg4, int arg5, DWORD arg6, DWORD arg7, DWORD arg8, DWORD arg9, DWORD arg10, DWORD arg11, DWORD arg12, DWORD arg13, const Extbyte * arg14); + /* Skipping CreateIC because split-sized DEVMODE */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateMetaFile +#define CreateMetaFile error use qxeCreateMetaFile or CreateMetaFileA/CreateMetaFileW +#endif HDC qxeCreateMetaFile (const Extbyte * arg1); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateScalableFontResource +#define CreateScalableFontResource error use qxeCreateScalableFontResource or CreateScalableFontResourceA/CreateScalableFontResourceW +#endif BOOL qxeCreateScalableFontResource (DWORD arg1, const Extbyte * arg2, const Extbyte * arg3, const Extbyte * arg4); + /* Skipping DeviceCapabilities because split-sized DEVMODE */ + /* Skipping EnumFontFamiliesEx because split-complex FONTENUMPROC; NT 4.0+ only */ + #undef EnumFontFamilies #define EnumFontFamilies error split-complex FONTENUMPROC + #undef EnumFonts #define EnumFonts error split-complex FONTENUMPROC + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetCharWidth +#define GetCharWidth error use qxeGetCharWidth or GetCharWidthA/GetCharWidthW +#endif BOOL qxeGetCharWidth (HDC arg1, UINT arg2, UINT arg3, LPINT arg4); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetCharWidth32 +#define GetCharWidth32 error use qxeGetCharWidth32 or GetCharWidth32A/GetCharWidth32W +#endif BOOL qxeGetCharWidth32 (HDC arg1, UINT arg2, UINT arg3, LPINT arg4); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetCharWidthFloat +#define GetCharWidthFloat error use qxeGetCharWidthFloat or GetCharWidthFloatA/GetCharWidthFloatW +#endif BOOL qxeGetCharWidthFloat (HDC arg1, UINT arg2, UINT arg3, PFLOAT arg4); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetCharABCWidths +#define GetCharABCWidths error use qxeGetCharABCWidths or GetCharABCWidthsA/GetCharABCWidthsW +#endif BOOL qxeGetCharABCWidths (HDC arg1, UINT arg2, UINT arg3, LPABC arg4); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetCharABCWidthsFloat +#define GetCharABCWidthsFloat error use qxeGetCharABCWidthsFloat or GetCharABCWidthsFloatA/GetCharABCWidthsFloatW +#endif BOOL qxeGetCharABCWidthsFloat (HDC arg1, UINT arg2, UINT arg3, LPABCFLOAT arg4); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetGlyphOutline +#define GetGlyphOutline error use qxeGetGlyphOutline or GetGlyphOutlineA/GetGlyphOutlineW +#endif DWORD qxeGetGlyphOutline (HDC arg1, UINT arg2, UINT arg3, LPGLYPHMETRICS arg4, DWORD arg5, LPVOID arg6, CONST MAT2 * arg7); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetMetaFile +#define GetMetaFile error use qxeGetMetaFile or GetMetaFileA/GetMetaFileW +#endif HMETAFILE qxeGetMetaFile (const Extbyte * arg1); + #undef GetOutlineTextMetrics #define GetOutlineTextMetrics error split-sized LPOUTLINETEXTMETRIC + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetTextExtentPoint +#define GetTextExtentPoint error use qxeGetTextExtentPoint or GetTextExtentPointA/GetTextExtentPointW +#endif BOOL qxeGetTextExtentPoint (HDC arg1, const Extbyte * arg2, int arg3, LPSIZE arg4); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetTextExtentPoint32 +#define GetTextExtentPoint32 error use qxeGetTextExtentPoint32 or GetTextExtentPoint32A/GetTextExtentPoint32W +#endif BOOL qxeGetTextExtentPoint32 (HDC arg1, const Extbyte * arg2, int arg3, LPSIZE arg4); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetTextExtentExPoint +#define GetTextExtentExPoint error use qxeGetTextExtentExPoint or GetTextExtentExPointA/GetTextExtentExPointW +#endif BOOL qxeGetTextExtentExPoint (HDC arg1, const Extbyte * arg2, int arg3, int arg4, LPINT arg5, LPINT arg6, LPSIZE arg7); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetCharacterPlacement +#define GetCharacterPlacement error use qxeGetCharacterPlacement or GetCharacterPlacementA/GetCharacterPlacementW +#endif DWORD qxeGetCharacterPlacement (HDC arg1, const Extbyte * arg2, int arg3, int arg4, LPGCP_RESULTSW arg5, DWORD arg6); + #undef GetGlyphIndices #define GetGlyphIndices error NT 5.0+ only + #undef AddFontResourceEx #define AddFontResourceEx error NT 5.0+ only + #undef RemoveFontResourceEx #define RemoveFontResourceEx error NT 5.0+ only + #undef CreateFontIndirectEx #define CreateFontIndirectEx error split-sized ENUMLOGFONTEXDV; NT 5.0+ only + /* Skipping ResetDC because split-sized DEVMODE */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RemoveFontResource +#define RemoveFontResource error use qxeRemoveFontResource or RemoveFontResourceA/RemoveFontResourceW +#endif BOOL qxeRemoveFontResource (const Extbyte * arg1); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CopyEnhMetaFile +#define CopyEnhMetaFile error use qxeCopyEnhMetaFile or CopyEnhMetaFileA/CopyEnhMetaFileW +#endif HENHMETAFILE qxeCopyEnhMetaFile (HENHMETAFILE arg1, const Extbyte * arg2); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateEnhMetaFile +#define CreateEnhMetaFile error use qxeCreateEnhMetaFile or CreateEnhMetaFileA/CreateEnhMetaFileW +#endif HDC qxeCreateEnhMetaFile (HDC arg1, const Extbyte * arg2, CONST RECT * arg3, const Extbyte * arg4); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetEnhMetaFile +#define GetEnhMetaFile error use qxeGetEnhMetaFile or GetEnhMetaFileA/GetEnhMetaFileW +#endif HENHMETAFILE qxeGetEnhMetaFile (const Extbyte * arg1); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetEnhMetaFileDescription +#define GetEnhMetaFileDescription error use qxeGetEnhMetaFileDescription or GetEnhMetaFileDescriptionA/GetEnhMetaFileDescriptionW +#endif UINT qxeGetEnhMetaFileDescription (HENHMETAFILE arg1, UINT arg2, Extbyte * arg3); + /* Skipping GetTextMetrics because split-sized LPTEXTMETRIC */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef StartDoc +#define StartDoc error use qxeStartDoc or StartDocA/StartDocW +#endif int qxeStartDoc (HDC arg1, CONST DOCINFOW * arg2); + /* Skipping GetObject because split-sized LOGFONT */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef TextOut +#define TextOut error use qxeTextOut or TextOutA/TextOutW +#endif BOOL qxeTextOut (HDC arg1, int arg2, int arg3, const Extbyte * arg4, int arg5); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ExtTextOut +#define ExtTextOut error use qxeExtTextOut or ExtTextOutA/ExtTextOutW +#endif BOOL qxeExtTextOut (HDC arg1, int arg2, int arg3, UINT arg4, CONST RECT * arg5, const Extbyte * arg6, UINT arg7, CONST INT * arg8); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef PolyTextOut +#define PolyTextOut error use qxePolyTextOut or PolyTextOutA/PolyTextOutW +#endif BOOL qxePolyTextOut (HDC arg1, CONST POLYTEXTW * arg2, int arg3); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetTextFace +#define GetTextFace error use qxeGetTextFace or GetTextFaceA/GetTextFaceW +#endif int qxeGetTextFace (HDC arg1, int arg2, Extbyte * arg3); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetKerningPairs +#define GetKerningPairs error use qxeGetKerningPairs or GetKerningPairsA/GetKerningPairsW +#endif DWORD qxeGetKerningPairs (HDC arg1, DWORD arg2, LPKERNINGPAIR arg3); + #undef GetLogColorSpace #define GetLogColorSpace error split-sized LPLOGCOLORSPACE; NT 4.0+ only + #undef CreateColorSpace #define CreateColorSpace error split-sized LPLOGCOLORSPACE; NT 4.0+ only + /* Skipping GetICMProfile because NT 4.0+ only, error in Cygwin prototype */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetICMProfile +#define SetICMProfile error use qxeSetICMProfile or SetICMProfileA/SetICMProfileW +#endif BOOL qxeSetICMProfile (HDC arg1, Extbyte * arg2); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef EnumICMProfiles +#define EnumICMProfiles error use qxeEnumICMProfiles or EnumICMProfilesA/EnumICMProfilesW +#endif int qxeEnumICMProfiles (HDC arg1, ICMENUMPROCW arg2, LPARAM arg3); + /* Skipping UpdateICMRegKey because NT 4.0+ only, error in Cygwin prototype */ + #undef wglUseFontBitmaps #define wglUseFontBitmaps error causes link error + #undef wglUseFontOutlines #define wglUseFontOutlines error causes link error +
--- a/src/intl-encap-win32.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/intl-encap-win32.c Sun Mar 31 08:30:17 2002 +0000 @@ -210,6 +210,8 @@ begin-unicode-encapsulation-script +// dir c:\Program Files\Microsoft Visual Studio\VC98\Include\ + file WINBASE.H yes GetBinaryType @@ -1049,6 +1051,7 @@ no EnumDateFormats not used, not examined yet no EnumDateFormatsEx not used, not examined yet no GetStringTypeEx not used, not examined yet +no GetStringType no such fun; A and W versions have different nos. of args no FoldString not used, not examined yet no EnumSystemLocales not used, not examined yet no EnumSystemCodePages not used, not examined yet @@ -1108,8 +1111,6 @@ yes InitiateSystemShutdown yes AbortSystemShutdown -end-unicode-encapsulation-script - file EXCPT.H // nothing @@ -1134,6 +1135,8 @@ // nothing +end-unicode-encapsulation-script + file WINSOCK2.H SO_PROTOCOL_INFO @@ -1253,6 +1256,17 @@ return DefMDIChildProcA (hWnd, uMsg, wParam, lParam); } +/* This one has two entry points called GetEnvironmentStringsW and + GetEnvironmentStrings. (misnamed A version) */ +Extbyte * +qxeGetEnvironmentStrings (void) +{ + if (XEUNICODE_P) + return (Extbyte *) GetEnvironmentStringsW (); + else + return (Extbyte *) GetEnvironmentStrings (); +} + /************************************************************************/ /* would be encapsulatable but for Cygwin problems */
--- a/src/intl-win32.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/intl-win32.c Sun Mar 31 08:30:17 2002 +0000 @@ -1832,11 +1832,8 @@ print_internal (make_int (data->cp), printcharfun, 1); else { - print_internal (mswindows_multibyte_to_unicode_getprop (cs, Qlocale), - printcharfun, 0); - write_c_string (", ", printcharfun); - print_internal (mswindows_multibyte_to_unicode_getprop (cs, Qcode_page), - printcharfun, 0); + write_fmt_string_lisp (printcharfun, "%s, ", 1, mswindows_multibyte_to_unicode_getprop (cs, Qlocale)); + print_internal (mswindows_multibyte_to_unicode_getprop (cs, Qcode_page), printcharfun, 0); } write_c_string (")", printcharfun); }
--- a/src/keymap.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/keymap.c Sun Mar 31 08:30:17 2002 +0000 @@ -257,18 +257,15 @@ { /* This function can GC */ Lisp_Keymap *keymap = XKEYMAP (obj); - char buf[200]; if (print_readably) printing_unreadable_object ("#<keymap 0x%x>", keymap->header.uid); write_c_string ("#<keymap ", printcharfun); if (!NILP (keymap->name)) { - print_internal (keymap->name, printcharfun, 1); - write_c_string (" ", printcharfun); + write_fmt_string_lisp (printcharfun, "%S ", 1, keymap->name); } - sprintf (buf, "size %ld 0x%x>", - (long) XINT (Fkeymap_fullness (obj)), keymap->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "size %ld 0x%x>", + (long) XINT (Fkeymap_fullness (obj)), keymap->header.uid); } static const struct lrecord_description keymap_description[] = {
--- a/src/lisp-disunion.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/lisp-disunion.h Sun Mar 31 08:30:17 2002 +0000 @@ -1,5 +1,6 @@ /* Fundamental definitions for XEmacs Lisp interpreter -- non-union objects. Copyright (C) 1985, 1986, 1987, 1992, 1993 Free Software Foundation, Inc. + Copyright (C) 2001 Ben Wing. This file is part of XEmacs. @@ -80,6 +81,7 @@ #define Lisp_Type_Int_Bit (Lisp_Type_Int_Even & Lisp_Type_Int_Odd) #define wrap_pointer_1(ptr) ((Lisp_Object) (ptr)) #define make_int(x) ((Lisp_Object) (((x) << INT_GCBITS) | Lisp_Type_Int_Bit)) +#define volatile_make_int(x) make_int (x) #define make_char(x) ((Lisp_Object) (((x) << GCBITS) | Lisp_Type_Char)) #define VALMASK (((1UL << VALBITS) - 1UL) << GCTYPEBITS) #define XTYPE(x) ((enum Lisp_Type) (((EMACS_UINT)(x)) & ~VALMASK))
--- a/src/lisp-union.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/lisp-union.h Sun Mar 31 08:30:17 2002 +0000 @@ -1,6 +1,7 @@ /* Fundamental definitions for XEmacs Lisp interpreter -- union objects. Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 2002 Ben Wing. This file is part of XEmacs. @@ -93,6 +94,18 @@ return obj; } +/* Ugh, need different definition to avoid compiler complaint in + unix_send_process() */ +INLINE_HEADER Lisp_Object volatile_make_int (EMACS_INT val); +INLINE_HEADER Lisp_Object +volatile_make_int (EMACS_INT val) +{ + volatile Lisp_Object obj; + obj.s.bits = 1; + obj.s.val = val; + return obj; +} + INLINE_HEADER Lisp_Object make_char (Emchar val); INLINE_HEADER Lisp_Object make_char (Emchar val) @@ -103,9 +116,9 @@ return obj; } -INLINE_HEADER Lisp_Object wrap_pointer_1 (void *ptr); +INLINE_HEADER Lisp_Object wrap_pointer_1 (const void *ptr); INLINE_HEADER Lisp_Object -wrap_pointer_1 (void *ptr) +wrap_pointer_1 (const void *ptr) { Lisp_Object obj; obj.ui = (EMACS_UINT) ptr;
--- a/src/lisp.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/lisp.h Sun Mar 31 08:30:17 2002 +0000 @@ -146,6 +146,7 @@ buffer.h (where they rightfully belong) to avoid syntax errors in function prototypes. */ + typedef EMACS_INT Charbpos; typedef EMACS_INT Bytebpos; typedef EMACS_INT Membpos; @@ -433,7 +434,7 @@ #define Dynarr_end(d) Dynarr_atp (d, Dynarr_length (d)) #define Dynarr_sizeof(d) ((d)->cur * (d)->elsize) -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_STRUCTURES DECLARE_INLINE_HEADER ( Dynarr * Dynarr_verify_1 (void *d, const char *file, int line) @@ -448,7 +449,7 @@ #define Dynarr_verify(d) Dynarr_verify_1 (d, __FILE__, __LINE__) #else #define Dynarr_verify(d) (d) -#endif /* ERROR_CHECK_TYPECHECK */ +#endif /* ERROR_CHECK_STRUCTURES */ #define Dynarr_length(d) (Dynarr_verify (d)->cur) #define Dynarr_largest(d) (Dynarr_verify (d)->largest) @@ -508,7 +509,7 @@ /* Error_Behavior typedefs */ /* ------------------------------- */ -#ifndef ERROR_CHECK_TYPECHECK +#ifndef ERROR_CHECK_TYPES typedef enum error_behavior { @@ -1399,7 +1400,7 @@ #define XSET_STRING_ASCII_BEGIN(s, val) \ ((void) (XSTRING (s)->u.v.ascii_begin = (val))) -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT #define SLEDGEHAMMER_CHECK_ASCII_BEGIN #endif @@ -1762,7 +1763,7 @@ #define CHARP(x) (XTYPE (x) == Lisp_Type_Char) -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES INLINE_HEADER Emchar XCHAR_1 (Lisp_Object obj, const char *file, int line); INLINE_HEADER Emchar @@ -1842,7 +1843,7 @@ #define ZEROP(x) EQ (x, Qzero) -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES #define XCHAR_OR_INT(x) XCHAR_OR_INT_1 (x, __FILE__, __LINE__) #define XINT(x) XINT_1 (x, __FILE__, __LINE__)
--- a/src/lread.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/lread.c Sun Mar 31 08:30:17 2002 +0000 @@ -690,7 +690,7 @@ block_size); lispstream = make_coding_input_stream (XLSTREAM (lispstream), get_coding_system_for_text_file (codesys, 1), - CODING_DECODE); + CODING_DECODE, 0); Lstream_set_buffering (XLSTREAM (lispstream), LSTREAM_BLOCKN_BUFFERED, block_size); /* NOTE: Order of these is very important. Don't rearrange them. */
--- a/src/lrecord.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/lrecord.h Sun Mar 31 08:30:17 2002 +0000 @@ -535,10 +535,10 @@ DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION is for objects whose size varies. */ -#if defined (ERROR_CHECK_TYPECHECK) -# define DECLARE_ERROR_CHECK_TYPECHECK(c_name, structtype) +#if defined (ERROR_CHECK_TYPES) +# define DECLARE_ERROR_CHECK_TYPES(c_name, structtype) #else -# define DECLARE_ERROR_CHECK_TYPECHECK(c_name, structtype) +# define DECLARE_ERROR_CHECK_TYPES(c_name, structtype) #endif #define DEFINE_BASIC_LRECORD_IMPLEMENTATION(name,c_name,marker,printer,nuker,equal,hash,desc,structtype) \ @@ -563,7 +563,7 @@ MAKE_LRECORD_IMPLEMENTATION(name,c_name,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,0,sizer,0,structtype) #define MAKE_LRECORD_IMPLEMENTATION(name,c_name,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,size,sizer,basic_p,structtype) \ -DECLARE_ERROR_CHECK_TYPECHECK(c_name, structtype) \ +DECLARE_ERROR_CHECK_TYPES(c_name, structtype) \ const struct lrecord_implementation lrecord_##c_name = \ { name, marker, printer, nuker, equal, hash, desc, \ getprop, putprop, remprop, plist, size, sizer, \ @@ -582,7 +582,7 @@ MAKE_EXTERNAL_LRECORD_IMPLEMENTATION(name,c_name,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,0,sizer,0,structtype) #define MAKE_EXTERNAL_LRECORD_IMPLEMENTATION(name,c_name,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,size,sizer,basic_p,structtype) \ -DECLARE_ERROR_CHECK_TYPECHECK(c_name, structtype) \ +DECLARE_ERROR_CHECK_TYPES(c_name, structtype) \ int lrecord_type_##c_name; \ struct lrecord_implementation lrecord_##c_name = \ { name, marker, printer, nuker, equal, hash, desc, \ @@ -747,7 +747,7 @@ */ -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES # define DECLARE_LRECORD(c_name, structtype) \ extern const struct lrecord_implementation lrecord_##c_name; \ @@ -790,10 +790,11 @@ # define XNONRECORD(x, c_name, type_enum, structtype) \ error_check_##c_name (x, __FILE__, __LINE__) -INLINE_HEADER Lisp_Object wrap_record_1 (void *ptr, enum lrecord_type ty, +INLINE_HEADER Lisp_Object wrap_record_1 (const void *ptr, enum lrecord_type ty, const char *file, int line); INLINE_HEADER Lisp_Object -wrap_record_1 (void *ptr, enum lrecord_type ty, const char *file, int line) +wrap_record_1 (const void *ptr, enum lrecord_type ty, const char *file, + int line) { Lisp_Object obj = wrap_pointer_1 (ptr); @@ -804,7 +805,7 @@ #define wrap_record(ptr, ty) \ wrap_record_1 (ptr, lrecord_type_##ty, __FILE__, __LINE__) -#else /* not ERROR_CHECK_TYPECHECK */ +#else /* not ERROR_CHECK_TYPES */ # define DECLARE_LRECORD(c_name, structtype) \ extern Lisp_Object Q##c_name##p; \ @@ -822,7 +823,7 @@ know what you're doing. */ #define wrap_record(ptr, ty) wrap_pointer_1 (ptr) -#endif /* not ERROR_CHECK_TYPECHECK */ +#endif /* not ERROR_CHECK_TYPES */ #define RECORDP(x, c_name) RECORD_TYPEP (x, lrecord_type_##c_name)
--- a/src/lstream.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/lstream.c Sun Mar 31 08:30:17 2002 +0000 @@ -61,11 +61,10 @@ print_lstream (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { Lstream *lstr = XLSTREAM (obj); - char buf[200]; - sprintf (buf, "#<INTERNAL OBJECT (XEmacs bug?) (%s lstream) 0x%lx>", - lstr->imp->name, (long) lstr); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, + "#<INTERNAL OBJECT (XEmacs bug?) (%s lstream) 0x%lx>", + lstr->imp->name, (long) lstr); } static void
--- a/src/lstream.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/lstream.h Sun Mar 31 08:30:17 2002 +0000 @@ -247,7 +247,7 @@ #define LSTREAM_TYPE_P(lstr, type) \ ((lstr)->imp == lstream_##type) -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES INLINE_HEADER struct lstream * error_check_lstream_type (struct lstream *stream, const Lstream_implementation *imp);
--- a/src/macros.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/macros.c Sun Mar 31 08:30:17 2002 +0000 @@ -30,14 +30,16 @@ #include <config.h> #include "lisp.h" -#include "events.h" -#include "macros.h" + +#include "buffer.h" #include "commands.h" #include "console.h" -#include "buffer.h" -#include "window.h" +#include "device.h" +#include "events.h" #include "frame.h" #include "keymap.h" +#include "macros.h" +#include "window.h" Lisp_Object Qexecute_kbd_macro;
--- a/src/marker.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/marker.c Sun Mar 31 08:30:17 2002 +0000 @@ -1,5 +1,6 @@ /* Markers: examining, setting and killing. Copyright (C) 1985, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. + Copyright (C) 2002 Ben Wing. This file is part of XEmacs. @@ -56,7 +57,6 @@ print_marker (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { Lisp_Marker *marker = XMARKER (obj); - char buf[200]; if (print_readably) printing_unreadable_object ("#<marker 0x%lx>", (long) marker); @@ -66,12 +66,10 @@ write_c_string (GETTEXT ("in no buffer"), printcharfun); else { - sprintf (buf, "at %ld in ", (long) marker_position (obj)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "at %ld in ", (long) marker_position (obj)); print_internal (marker->buffer->name, printcharfun, 0); } - sprintf (buf, " 0x%lx>", (long) marker); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " 0x%lx>", (long) marker); } static int @@ -299,7 +297,7 @@ if (b == 0) return; -#ifdef ERROR_CHECK_GC +#ifdef ERROR_CHECK_STRUCTURES assert (BUFFER_LIVE_P (b)); #endif @@ -310,7 +308,7 @@ else BUF_MARKERS (b) = marker_next (marker); -#ifdef ERROR_CHECK_GC +#ifdef ERROR_CHECK_STRUCTURES assert (marker != XMARKER (b->point_marker)); #endif @@ -335,7 +333,7 @@ positions. */ pos = membpos_to_bytebpos (buf, m->membpos); -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT if (pos < BI_BUF_BEG (buf) || pos > BI_BUF_Z (buf)) abort (); #endif @@ -363,7 +361,7 @@ if (!buf) invalid_argument ("Marker does not point anywhere", Qunbound); -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT if (pos < BI_BUF_BEG (buf) || pos > BI_BUF_Z (buf)) abort (); #endif
--- a/src/md5.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/md5.c Sun Mar 31 08:30:17 2002 +0000 @@ -1,7 +1,7 @@ /* md5.c - Functions to compute MD5 message digest of files or memory blocks according to the definition of MD5 in RFC 1321 from April 1992. Copyright (C) 1995, 1996 Free Software Foundation, Inc. - Copyright (C) 2001 Ben Wing. + Copyright (C) 2001, 2002 Ben Wing. NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu. @@ -515,11 +515,10 @@ unsigned char thehash[33]; int i; - Lisp_Object instream; - struct gcpro gcpro1; - Lisp_Object raw_instream; - struct gcpro ngcpro1; + Lisp_Object raw_instream = Qnil, instream = Qnil; + struct gcpro gcpro1, gcpro2; + GCPRO2 (raw_instream, instream); /* Set up the input stream. */ if (BUFFERP (object)) { @@ -530,7 +529,7 @@ /* Figure out where we need to get info from */ get_buffer_range_char (b, start, end, &begv, &endv, GB_ALLOW_NIL); - instream = make_lisp_buffer_input_stream (b, begv, endv, 0); + raw_instream = make_lisp_buffer_input_stream (b, begv, endv, 0); } else { @@ -538,15 +537,15 @@ CHECK_STRING (object); get_string_range_byte (object, start, end, &bstart, &bend, GB_HISTORICAL_STRING_BEHAVIOR); - instream = make_lisp_string_input_stream (object, bstart, bend - bstart); + raw_instream = make_lisp_string_input_stream (object, bstart, + bend - bstart); } - GCPRO1 (instream); /* Determine the coding and set up the conversion stream. */ - coding = md5_coding_system (object, coding, instream, !NILP (noerror)); - raw_instream = instream; - instream = make_coding_input_stream (XLSTREAM (instream), coding, CODING_ENCODE); - NGCPRO1 (raw_instream); + coding = md5_coding_system (object, coding, raw_instream, !NILP (noerror)); + Lstream_rewind (XLSTREAM (raw_instream)); + instream = make_coding_input_stream (XLSTREAM (raw_instream), coding, + CODING_ENCODE, 0); /* Initialize MD5 context. */ md5_init_ctx (&ctx); @@ -565,7 +564,6 @@ } Lstream_delete (XLSTREAM (instream)); Lstream_delete (XLSTREAM (raw_instream)); - NUNGCPRO; UNGCPRO; md5_finish_ctx (&ctx, digest);
--- a/src/menubar-x.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/menubar-x.c Sun Mar 31 08:30:17 2002 +0000 @@ -1,7 +1,7 @@ /* Implements an elisp-programmable menubar -- X interface. Copyright (C) 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995 Tinker Systems and INS Engineering Corp. - Copyright (C) 2000, 2001 Ben Wing. + Copyright (C) 2000, 2001 ,2002 Ben Wing. This file is part of XEmacs. @@ -36,13 +36,9 @@ #include <config.h> #include "lisp.h" -#include "console-x.h" -#include "EmacsFrame.h" -#include "gui-x.h" -#include "../lwlib/lwlib.h" - #include "buffer.h" #include "commands.h" /* zmacs_regions */ +#include "device.h" #include "events.h" #include "frame.h" #include "gui.h" @@ -51,6 +47,12 @@ #include "opaque.h" #include "window.h" +#include "console-x.h" +#include "gui-x.h" + +#include "EmacsFrame.h" +#include "../lwlib/lwlib.h" + static int set_frame_menubar (struct frame *f, int deep_p, int first_time_p); @@ -984,15 +986,13 @@ { int i; Lisp_Object t; - char buf[50]; t = builder->current_events; i = 0; while (!NILP (t)) { i++; - sprintf (buf,"OPERATE (%d): ",i); - write_c_string (buf, Qexternal_debugging_output); + write_fmt_string (Qexternal_debugging_output, "OPERATE (%d): ",i); print_internal (t, Qexternal_debugging_output, 1); write_c_string ("\n", Qexternal_debugging_output); t = XEVENT_NEXT (t);
--- a/src/menubar.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/menubar.c Sun Mar 31 08:30:17 2002 +0000 @@ -40,6 +40,7 @@ #include "keymap.h" #include "menubar.h" #include "redisplay.h" +#include "specifier.h" #include "window.h" int menubar_show_keybindings;
--- a/src/mule-coding.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/mule-coding.c Sun Mar 31 08:30:17 2002 +0000 @@ -2657,17 +2657,15 @@ if (i > 0) write_c_string (", ", printcharfun); write_fmt_string (printcharfun, "g%d=", i); - print_internal (CHARSETP (charset) ? XCHARSET_NAME (charset) : charset, - printcharfun, 0); + print_internal (CHARSETP (charset) ? XCHARSET_NAME (charset) : charset, printcharfun, 0); if (XCODING_SYSTEM_ISO2022_FORCE_CHARSET_ON_OUTPUT (cs, i)) write_c_string ("(force)", printcharfun); } -#define FROB(prop) \ - if (!NILP (iso2022_getprop (cs, prop))) \ - { \ - write_c_string (", ", printcharfun); \ - print_internal (prop, printcharfun, 0); \ +#define FROB(prop) \ + if (!NILP (iso2022_getprop (cs, prop))) \ + { \ + write_fmt_string (printcharfun, ", %s", prop); \ } FROB (Qshort); @@ -2684,16 +2682,14 @@ (XCODING_SYSTEM_ISO2022_INPUT_CONV (cs), 1); if (!NILP (val)) { - write_c_string (", input-charset-conversion=", printcharfun); - print_internal (val, printcharfun, 0); + write_fmt_string_lisp (printcharfun, ", input-charset-conversion=%s", 1, val); } val = unparse_charset_conversion_specs (XCODING_SYSTEM_ISO2022_OUTPUT_CONV (cs), 1); if (!NILP (val)) { - write_c_string (", output-charset-conversion=", printcharfun); - print_internal (val, printcharfun, 0); + write_fmt_string_lisp (printcharfun, ", output-charset-conversion=%s", 1, val); } write_c_string (")", printcharfun); }
--- a/src/ntproc.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/ntproc.c Sun Mar 31 08:30:17 2002 +0000 @@ -163,7 +163,7 @@ va_start (args, fmt); vsprintf (buf, fmt, args); va_end (args); - OutputDebugString (buf); + OutputDebugStringA (buf); #endif } @@ -200,10 +200,10 @@ cp->status = STATUS_READ_ERROR; /* use manual reset event so that select() will function properly */ - cp->char_avail = CreateEvent (NULL, TRUE, FALSE, NULL); + cp->char_avail = CreateEventA (NULL, TRUE, FALSE, NULL); if (cp->char_avail) { - cp->char_consumed = CreateEvent (NULL, FALSE, FALSE, NULL); + cp->char_consumed = CreateEventA (NULL, FALSE, FALSE, NULL); if (cp->char_consumed) { cp->thrd = CreateThread (NULL, 1024, reader_thread, cp, 0, &id); @@ -498,7 +498,7 @@ strcpy (dir, process_dir); unixtodos_filename (dir); - if (!CreateProcess (exe, cmdline, &sec_attrs, NULL, TRUE, + if (!CreateProcessA (exe, cmdline, &sec_attrs, NULL, TRUE, (!NILP (Vwin32_start_process_share_console) ? CREATE_NEW_PROCESS_GROUP : CREATE_NEW_CONSOLE), @@ -856,7 +856,7 @@ { char window_class[32]; - GetClassName (hwnd, window_class, sizeof (window_class)); + GetClassNameA (hwnd, window_class, sizeof (window_class)); if (strcmp (window_class, mswindows_windows9x_p ? "tty" @@ -909,16 +909,16 @@ { if (NILP (Vwin32_start_process_share_console) && cp && cp->hwnd) { - BYTE control_scan_code = (BYTE) MapVirtualKey (VK_CONTROL, 0); + BYTE control_scan_code = (BYTE) MapVirtualKeyA (VK_CONTROL, 0); BYTE vk_break_code = VK_CANCEL; - BYTE break_scan_code = (BYTE) MapVirtualKey (vk_break_code, 0); + BYTE break_scan_code = (BYTE) MapVirtualKeyA (vk_break_code, 0); HWND foreground_window; if (break_scan_code == 0) { /* Fake Ctrl-C if we can't manage Ctrl-Break. */ vk_break_code = 'C'; - break_scan_code = (BYTE) MapVirtualKey (vk_break_code, 0); + break_scan_code = (BYTE) MapVirtualKeyA (vk_break_code, 0); } foreground_window = GetForegroundWindow (); @@ -990,7 +990,7 @@ } else #endif - PostMessage (cp->hwnd, WM_CLOSE, 0, 0); + PostMessageA (cp->hwnd, WM_CLOSE, 0, 0); } /* Kill the process. On Win32 this doesn't kill child processes so it doesn't work very well for shells which is why it's not
--- a/src/objects-gtk.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/objects-gtk.c Sun Mar 31 08:30:17 2002 +0000 @@ -140,11 +140,9 @@ Lisp_Object printcharfun, int escapeflag) { - char buf[100]; GdkColor *color = COLOR_INSTANCE_GTK_COLOR (c); - sprintf (buf, " %ld=(%X,%X,%X)", - color->pixel, color->red, color->green, color->blue); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " %ld=(%X,%X,%X)", + color->pixel, color->red, color->green, color->blue); } static void @@ -318,9 +316,8 @@ Lisp_Object printcharfun, int escapeflag) { - char buf[200]; - sprintf (buf, " 0x%lx", (unsigned long) gdk_font_id (FONT_INSTANCE_GTK_FONT (f))); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " 0x%lx", + (unsigned long) gdk_font_id (FONT_INSTANCE_GTK_FONT (f))); } static void
--- a/src/objects-msw.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/objects-msw.c Sun Mar 31 08:30:17 2002 +0000 @@ -40,6 +40,7 @@ #include "console-msw.h" #include "objects-msw.h" + #include "buffer.h" #include "charset.h" #include "device.h" @@ -1741,21 +1742,21 @@ switch (nsep) { case 0: - qxestrcat (name, ":Regular:10::Western"); + qxestrcat_c (name, ":Regular:10::Western"); break; case 1: - qxestrcat (name, ":10::Western"); + qxestrcat_c (name, ":10::Western"); break; case 2: - qxestrcat (name, "::Western"); + qxestrcat_c (name, "::Western"); break; case 3: - qxestrcat (name, ":Western"); + qxestrcat_c (name, ":Western"); break; default:; } - return build_string (name); + return build_intstring (name); } #ifdef MULE
--- a/src/objects-x.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/objects-x.c Sun Mar 31 08:30:17 2002 +0000 @@ -2,7 +2,7 @@ Copyright (C) 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995 Tinker Systems. - Copyright (C) 1995, 1996, 2000, 2001 Ben Wing. + Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing. Copyright (C) 1995 Sun Microsystems, Inc. This file is part of XEmacs. @@ -285,11 +285,9 @@ Lisp_Object printcharfun, int escapeflag) { - char buf[100]; XColor color = COLOR_INSTANCE_X_COLOR (c); - sprintf (buf, " %ld=(%X,%X,%X)", - color.pixel, color.red, color.green, color.blue); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " %ld=(%X,%X,%X)", + color.pixel, color.red, color.green, color.blue); } static void @@ -467,9 +465,8 @@ Lisp_Object printcharfun, int escapeflag) { - char buf[200]; - sprintf (buf, " 0x%lx", (unsigned long) FONT_INSTANCE_X_FONT (f)->fid); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " 0x%lx", + (unsigned long) FONT_INSTANCE_X_FONT (f)->fid); } static void
--- a/src/objects.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/objects.c Sun Mar 31 08:30:17 2002 +0000 @@ -30,6 +30,7 @@ #include "elhash.h" #include "faces.h" #include "frame.h" +#include "glyphs.h" #include "objects.h" #include "specifier.h" #include "window.h" @@ -72,20 +73,16 @@ print_color_instance (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { - char buf[100]; Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj); if (print_readably) printing_unreadable_object ("#<color-instance 0x%x>", c->header.uid); - write_c_string ("#<color-instance ", printcharfun); - print_internal (c->name, printcharfun, 0); - write_c_string (" on ", printcharfun); - print_internal (c->device, printcharfun, 0); + write_fmt_string_lisp (printcharfun, "#<color-instance %s", 1, c->name); + write_fmt_string_lisp (printcharfun, " on %s", 1, c->device); if (!NILP (c->device)) /* Vthe_null_color_instance */ MAYBE_DEVMETH (XDEVICE (c->device), print_color_instance, (c, printcharfun, escapeflag)); - sprintf (buf, " 0x%x>", c->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " 0x%x>", c->header.uid); } static void @@ -250,19 +247,15 @@ static void print_font_instance (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { - char buf[200]; Lisp_Font_Instance *f = XFONT_INSTANCE (obj); if (print_readably) printing_unreadable_object ("#<font-instance 0x%x>", f->header.uid); - write_c_string ("#<font-instance ", printcharfun); - print_internal (f->name, printcharfun, 1); - write_c_string (" on ", printcharfun); - print_internal (f->device, printcharfun, 0); + write_fmt_string_lisp (printcharfun, "#<font-instance %S", 1, f->name); + write_fmt_string_lisp (printcharfun, " on %s", 1, f->device); if (!NILP (f->device)) MAYBE_DEVMETH (XDEVICE (f->device), print_font_instance, (f, printcharfun, escapeflag)); - sprintf (buf, " 0x%x>", f->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " 0x%x>", f->header.uid); } static void
--- a/src/opaque.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/opaque.c Sun Mar 31 08:30:17 2002 +0000 @@ -1,6 +1,6 @@ /* Opaque Lisp objects. Copyright (C) 1993, 1994, 1995 Sun Microsystems, Inc. - Copyright (C) 1995, 1996 Ben Wing. + Copyright (C) 1995, 1996, 2002 Ben Wing. This file is part of XEmacs. @@ -45,11 +45,11 @@ print_opaque (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { const Lisp_Opaque *p = XOPAQUE (obj); - char buf[200]; - sprintf (buf, "#<INTERNAL OBJECT (XEmacs bug?) (opaque, size=%lu) 0x%lx>", - (long)(p->size), (unsigned long) p); - write_c_string (buf, printcharfun); + write_fmt_string + (printcharfun, + "#<INTERNAL OBJECT (XEmacs bug?) (opaque, size=%lu) 0x%lx>", + (long)(p->size), (unsigned long) p); } inline static Bytecount @@ -126,11 +126,11 @@ print_opaque_ptr (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { const Lisp_Opaque_Ptr *p = XOPAQUE_PTR (obj); - char buf[200]; - sprintf (buf, "#<INTERNAL OBJECT (XEmacs bug?) (opaque-ptr, adr=0x%lx) 0x%lx>", - (long)(p->ptr), (unsigned long) p); - write_c_string (buf, printcharfun); + write_fmt_string + (printcharfun, + "#<INTERNAL OBJECT (XEmacs bug?) (opaque-ptr, adr=0x%lx) 0x%lx>", + (long)(p->ptr), (unsigned long) p); } static int
--- a/src/print.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/print.c Sun Mar 31 08:30:17 2002 +0000 @@ -38,18 +38,21 @@ #include "backtrace.h" #include "buffer.h" #include "bytecode.h" -#include "console-tty.h" -#include "console-stream.h" +#include "device.h" #include "extents.h" #include "frame.h" #include "insdel.h" #include "lstream.h" #include "opaque.h" -#include "sysfile.h" + +#include "console-tty.h" +#include "console-stream.h" #ifdef WIN32_NATIVE #include "console-msw.h" #endif +#include "sysfile.h" + #include <float.h> /* Define if not in float.h */ #ifndef DBL_DIG @@ -544,7 +547,7 @@ write_string_1 (const Intbyte *str, Bytecount size, Lisp_Object stream) { /* This function can GC */ -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT assert (size >= 0); #endif output_string (stream, str, Qnil, 0, size); @@ -1359,7 +1362,6 @@ { struct lcrecord_header *header = (struct lcrecord_header *) XPNTR (obj); - char buf[200]; if (print_readably) printing_unreadable_object @@ -1367,21 +1369,19 @@ LHEADER_IMPLEMENTATION (&header->lheader)->name, header->uid); - sprintf (buf, "#<%s 0x%x>", - LHEADER_IMPLEMENTATION (&header->lheader)->name, - header->uid); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "#<%s 0x%x>", + LHEADER_IMPLEMENTATION (&header->lheader)->name, + header->uid); } void internal_object_printer (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { - char buf[200]; - sprintf (buf, "#<INTERNAL OBJECT (XEmacs bug?) (%s) 0x%lx>", - XRECORD_LHEADER_IMPLEMENTATION (obj)->name, - (unsigned long) XPNTR (obj)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, + "#<INTERNAL OBJECT (XEmacs bug?) (%s) 0x%lx>", + XRECORD_LHEADER_IMPLEMENTATION (obj)->name, + (unsigned long) XPNTR (obj)); } void @@ -1406,10 +1406,8 @@ if (!debug_can_access_memory (lheader, sizeof (*lheader))) { - char buf[128]; - - sprintf (buf, "#<EMACS BUG: BAD MEMORY %p>", lheader); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "#<EMACS BUG: BAD MEMORY %p>", + lheader); return; } else @@ -1418,11 +1416,9 @@ if ((int) lheader->type >= lrecord_type_count) { - char buf[128]; - - sprintf (buf, "#<EMACS BUG: bad type %d BAD MEMORY %p>", - lheader->type, lheader); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, + "#<EMACS BUG: bad type %d BAD MEMORY %p>", + lheader->type, lheader); return; } @@ -1433,11 +1429,9 @@ impl->size_in_bytes_method (lheader) : impl->static_size))) { - char buf[128]; - - sprintf (buf, "#<EMACS BUG: type %s BAD MEMORY %p>", - impl->name, lheader); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, + "#<EMACS BUG: type %s BAD MEMORY %p>", + impl->name, lheader); return; } @@ -1447,11 +1441,10 @@ if (!debug_can_access_memory (l->data_, l->size_)) { - char buf[128]; - - sprintf (buf, "#<EMACS BUG: %p (BAD STRING DATA %p)>", - lheader, l->data_); - write_c_string (buf, printcharfun); + write_fmt_string + (printcharfun, + "#<EMACS BUG: %p (BAD STRING DATA %p)>", + lheader, l->data_); return; } } @@ -1599,22 +1592,20 @@ default: { -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES abort (); -#else /* not ERROR_CHECK_TYPECHECK */ - char buf[128]; +#else /* not ERROR_CHECK_TYPES */ /* We're in trouble if this happens! */ if (print_readably) signal_error (Qinternal_error, "printing illegal data type #o%03o", make_int (XTYPE (obj))); write_c_string ("#<EMACS BUG: ILLEGAL DATATYPE ", printcharfun); - sprintf (buf, "(#o%3o)", (int) XTYPE (obj)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "(#o%3o)", (int) XTYPE (obj)); write_c_string (" Save your buffers immediately and please report this bug>", printcharfun); -#endif /* not ERROR_CHECK_TYPECHECK */ +#endif /* not ERROR_CHECK_TYPES */ break; } }
--- a/src/process-nt.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/process-nt.c Sun Mar 31 08:30:17 2002 +0000 @@ -564,7 +564,7 @@ than ideal in that subprocesses tend to stick around until the machine is shutdown, but at least it doesn't freeze the 16-bit subsystem. */ - PostMessage (cp->hwnd, WM_QUIT, 0xff, 0); + qxePostMessage (cp->hwnd, WM_QUIT, 0xff, 0); #endif if (!TerminateProcess (h_process, 0xff)) { @@ -578,7 +578,7 @@ } else #endif - PostMessage (cp->hwnd, WM_CLOSE, 0, 0); + qxePostMessage (cp->hwnd, WM_CLOSE, 0, 0); } /* Kill the process. On W32 this doesn't kill child processes so it doesn't work very well for shells which is why it's not @@ -1205,7 +1205,7 @@ while (1) { MSG msg; - GetMessage (&msg, hwnd, 0, 0); + qxeGetMessage (&msg, hwnd, 0, 0); if (msg.message == XM_SOCKREPLY) { /* Ok, got an answer */ @@ -1222,7 +1222,7 @@ REALLY_QUIT; } } - DispatchMessage (&msg); + qxeDispatchMessage (&msg); } done:
--- a/src/process-unix.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/process-unix.c Sun Mar 31 08:30:17 2002 +0000 @@ -1301,7 +1301,7 @@ /* Lstream_write() will never successfully write less than the amount sent in. In the worst case, it just buffers the unwritten data. */ - writeret = Lstream_write (XLSTREAM (DATA_OUTSTREAM(p)), chunkbuf, + writeret = Lstream_write (XLSTREAM (DATA_OUTSTREAM (p)), chunkbuf, chunklen); { int save_errno = errno; @@ -1317,7 +1317,7 @@ /* Buffer is full. Wait, accepting input; that may allow the program to finish doing output and read more. */ - Faccept_process_output (Qnil, make_int (1), Qnil); + Faccept_process_output (Qnil, volatile_make_int (1), Qnil); /* It could have *really* finished, deleting the process */ if (NILP(p->pipe_outstream)) return; @@ -1345,7 +1345,7 @@ } old_sigpipe = (SIGTYPE (*) (int)) EMACS_SIGNAL (SIGPIPE, send_process_trap); - Lstream_flush (XLSTREAM (DATA_OUTSTREAM(p))); + Lstream_flush (XLSTREAM (DATA_OUTSTREAM (p))); EMACS_SIGNAL (SIGPIPE, old_sigpipe); }
--- a/src/process.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/process.c Sun Mar 31 08:30:17 2002 +0000 @@ -38,7 +38,9 @@ #include "buffer.h" #include "commands.h" +#include "device.h" #include "events.h" +#include "file-coding.h" #include "frame.h" #include "hash.h" #include "insdel.h" @@ -47,7 +49,6 @@ #include "process.h" #include "procimpl.h" #include "window.h" -#include "file-coding.h" #include "sysfile.h" #include "sysproc.h" @@ -157,8 +158,7 @@ print_internal (process->name, printcharfun, 1); write_c_string ((netp ? " " : " pid "), printcharfun); print_internal (process->pid, printcharfun, 1); - write_c_string (" state:", printcharfun); - print_internal (process->status_symbol, printcharfun, 1); + write_fmt_string_lisp (printcharfun, " state:%S", 1, process->status_symbol); MAYBE_PROCMETH (print_process_data, (process, printcharfun)); write_c_string (">", printcharfun); } @@ -525,10 +525,12 @@ MAYBE_PROCMETH (init_process_io_handles, (p, in, out, flags)); p->coding_instream = - make_coding_input_stream (XLSTREAM (p->pipe_instream), incode, CODING_DECODE); + make_coding_input_stream (XLSTREAM (p->pipe_instream), incode, + CODING_DECODE, 0); Lstream_set_character_mode (XLSTREAM (p->coding_instream)); p->coding_outstream = - make_coding_output_stream (XLSTREAM (p->pipe_outstream), outcode, CODING_ENCODE); + make_coding_output_stream (XLSTREAM (p->pipe_outstream), outcode, + CODING_ENCODE, 0); } static void
--- a/src/rangetab.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/rangetab.c Sun Mar 31 08:30:17 2002 +0000 @@ -1,6 +1,6 @@ /* XEmacs routines to deal with range tables. Copyright (C) 1995 Sun Microsystems, Inc. - Copyright (C) 1995 Ben Wing. + Copyright (C) 1995, 2002 Ben Wing. This file is part of XEmacs. @@ -55,7 +55,6 @@ print_range_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { Lisp_Range_Table *rt = XRANGE_TABLE (obj); - char buf[200]; int i; write_c_string ("#s(range-table data (", printcharfun); @@ -65,10 +64,10 @@ if (i > 0) write_c_string (" ", printcharfun); if (rte->first == rte->last) - sprintf (buf, "%ld ", (long) (rte->first)); + write_fmt_string (printcharfun, "%ld ", (long) (rte->first)); else - sprintf (buf, "(%ld %ld) ", (long) (rte->first), (long) (rte->last)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "(%ld %ld) ", (long) (rte->first), + (long) (rte->last)); print_internal (rte->val, printcharfun, 1); } write_c_string ("))", printcharfun); @@ -167,7 +166,7 @@ /* Range table operations */ /************************************************************************/ -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_STRUCTURES static void verify_range_table (Lisp_Range_Table *rt)
--- a/src/redisplay-msw.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/redisplay-msw.c Sun Mar 31 08:30:17 2002 +0000 @@ -37,20 +37,21 @@ #include <config.h> #include "lisp.h" -#include "console-msw.h" -#include "objects-msw.h" - #include "buffer.h" +#include "charset.h" #include "debug.h" +#include "device.h" #include "events.h" #include "faces.h" #include "frame.h" -#include "glyphs-msw.h" #include "gutter.h" #include "redisplay.h" #include "sysdep.h" #include "window.h" -#include "charset.h" + +#include "console-msw.h" +#include "glyphs-msw.h" +#include "objects-msw.h" #define MSWINDOWS_EOL_CURSOR_WIDTH 5
--- a/src/redisplay-output.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/redisplay-output.c Sun Mar 31 08:30:17 2002 +0000 @@ -107,16 +107,16 @@ display_line_dynarr *cdla, display_line_dynarr *ddla) { - int cdla_len = Dynarr_length (cdla); - struct display_line dl, *clp, *dlp; int db_elt; + int local = 0; dlp = Dynarr_atp (ddla, line); if (line >= Dynarr_largest (cdla)) { clp = &dl; clp->display_blocks = Dynarr_new (display_block); + local = 1; } else { @@ -143,40 +143,42 @@ clp->right_glyphs = 0; } - if (!do_blocks && line >= cdla_len) + if (do_blocks || line < Dynarr_length (cdla)) { - Dynarr_add (cdla, *clp); - return; + for (db_elt = 0; db_elt < Dynarr_length (dlp->display_blocks); db_elt++) + { + struct display_block db, *cdb; + struct display_block *ddb = Dynarr_atp (dlp->display_blocks, db_elt); + + if (db_elt >= Dynarr_largest (clp->display_blocks)) + { + cdb = &db; + memcpy (cdb, ddb, sizeof (struct display_block)); + cdb->runes = Dynarr_new (rune); + Dynarr_add (clp->display_blocks, *cdb); + } + else + { + rune_dynarr *tr; + + cdb = Dynarr_atp (clp->display_blocks, db_elt); + tr = cdb->runes; + memcpy (cdb, ddb, sizeof (struct display_block)); + cdb->runes = tr; + Dynarr_increment (clp->display_blocks); + } + + sync_rune_structs (w, cdb->runes, ddb->runes); + } } - for (db_elt = 0; db_elt < Dynarr_length (dlp->display_blocks); db_elt++) + if (local) + Dynarr_add (cdla, *clp); + else if (line >= Dynarr_length (cdla)) { - struct display_block db, *cdb; - struct display_block *ddb = Dynarr_atp (dlp->display_blocks, db_elt); - - if (db_elt >= Dynarr_largest (clp->display_blocks)) - { - cdb = &db; - memcpy (cdb, ddb, sizeof (struct display_block)); - cdb->runes = Dynarr_new (rune); - Dynarr_add (clp->display_blocks, *cdb); - } - else - { - rune_dynarr *tr; - - cdb = Dynarr_atp (clp->display_blocks, db_elt); - tr = cdb->runes; - memcpy (cdb, ddb, sizeof (struct display_block)); - cdb->runes = tr; - Dynarr_increment (clp->display_blocks); - } - - sync_rune_structs (w, cdb->runes, ddb->runes); + assert (line == Dynarr_length (cdla)); + Dynarr_increment (cdla); } - - if (line >= cdla_len) - Dynarr_add (cdla, *clp); } /*****************************************************************************
--- a/src/redisplay-tty.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/redisplay-tty.c Sun Mar 31 08:30:17 2002 +0000 @@ -33,17 +33,19 @@ #include "lisp.h" #include "buffer.h" -#include "console-tty.h" +#include "device.h" #include "events.h" #include "faces.h" #include "frame.h" #include "glyphs.h" #include "lstream.h" -#include "objects-tty.h" #include "redisplay.h" #include "sysdep.h" #include "window.h" +#include "console-tty.h" +#include "objects-tty.h" + /* These headers #define all kinds of common words like "columns"... What a bunch of losers. If we were to include them, we'd have to include them last to prevent them from messing up our own header
--- a/src/redisplay-x.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/redisplay-x.c Sun Mar 31 08:30:17 2002 +0000 @@ -30,29 +30,32 @@ #include <config.h> #include "lisp.h" -#include "console-x.h" -#include "EmacsFrame.h" -#include "EmacsFrameP.h" -#include "xgccache.h" -#include "glyphs-x.h" -#include "objects-x.h" - #include "buffer.h" #include "debug.h" +#include "device.h" #include "faces.h" +#include "file-coding.h" #include "frame.h" #include "gutter.h" #include "redisplay.h" #include "sysdep.h" #include "window.h" -#include <X11/bitmaps/gray> + +#ifdef MULE +#include "mule-ccl.h" +#endif + +#include "console-x.h" +#include "glyphs-x.h" +#include "objects-x.h" +#include "xgccache.h" + +#include "EmacsFrame.h" +#include "EmacsFrameP.h" #include "sysproc.h" /* for select() */ -#ifdef MULE -#include "mule-ccl.h" -#include "file-coding.h" /* for CCL conversion */ -#endif +#include <X11/bitmaps/gray> /* Number of pixels below each line. */ int x_interline_space; /* #### implement me */
--- a/src/redisplay.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/redisplay.c Sun Mar 31 08:30:17 2002 +0000 @@ -264,6 +264,8 @@ Charbpos point, int no_regen); static int point_visible (struct window *w, Charbpos point, int type); +static void sledgehammer_check_redisplay_structs (void); + /* This used to be 10 but 30 seems to give much better performance. */ #define INIT_MAX_PREEMPTS 30 static int max_preempts; @@ -4226,10 +4228,7 @@ if (Dynarr_length (dla) == 0) { if (Dynarr_largest (dla) > 0) - { - struct display_line *mlp = Dynarr_atp (dla, 0); - Dynarr_add (dla, *mlp); - } + Dynarr_increment (dla); else { struct display_line modeline; @@ -6627,6 +6626,9 @@ done: unbind_to (count); +#ifdef ERROR_CHECK_DISPLAY + sledgehammer_check_redisplay_structs (); +#endif /* ERROR_CHECK_DISPLAY */ } void @@ -9136,6 +9138,35 @@ #endif /* MEMORY_USAGE_STATS */ +static int +sledgehammer_check_redisplay_structs_1 (struct window *w, void *closure) +{ + int i, j; + display_line_dynarr *dl; + + dl = window_display_lines (w, CURRENT_DISP); + + for (i = 0; i < Dynarr_largest (dl); i++) + for (j = i + 1; j < Dynarr_largest (dl); j++) + assert (Dynarr_atp (dl, i)->display_blocks != + Dynarr_atp (dl, j)->display_blocks); + + dl = window_display_lines (w, DESIRED_DISP); + + for (i = 0; i < Dynarr_largest (dl); i++) + for (j = i + 1; j < Dynarr_largest (dl); j++) + assert (Dynarr_atp (dl, i)->display_blocks != + Dynarr_atp (dl, j)->display_blocks); + + return 0; +} + +static void +sledgehammer_check_redisplay_structs (void) +{ + map_windows (0, sledgehammer_check_redisplay_structs_1, NULL); +} + /***************************************************************************/ /* */
--- a/src/regex.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/regex.c Sun Mar 31 08:30:17 2002 +0000 @@ -4482,7 +4482,7 @@ return result; } -#if defined (ERROR_CHECK_CHARBPOS) && defined (emacs) +#if defined (ERROR_CHECK_TEXT) && defined (emacs) int in_re_match_2_internal; /* #### I am seeing an error (once) where regex_match_object gets set @@ -4501,7 +4501,7 @@ #define RESTORE_IN_MATCH_FLAG do {} while (0) -#endif /* defined (ERROR_CHECK_CHARBPOS) && defined (emacs) */ +#endif /* defined (ERROR_CHECK_TEXT) && defined (emacs) */ /* This is a separate function so that we can force an alloca cleanup @@ -4639,7 +4639,7 @@ /* 1 if this match is the best seen so far. */ re_bool best_match_p; -#if defined (ERROR_CHECK_CHARBPOS) && defined (emacs) +#if defined (ERROR_CHECK_TEXT) && defined (emacs) int speccount = specpdl_depth (); #if 0 @@ -4648,7 +4648,7 @@ #endif in_re_match_2_internal = 1; record_unwind_protect (restore_in_re_match_2_internal, Qnil); -#endif /* defined (ERROR_CHECK_CHARBPOS) && defined (emacs) */ +#endif /* defined (ERROR_CHECK_TEXT) && defined (emacs) */ DEBUG_PRINT1 ("\n\nEntering re_match_2.\n");
--- a/src/s/windowsnt.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/s/windowsnt.h Sun Mar 31 08:30:17 2002 +0000 @@ -1,6 +1,6 @@ /* System description file for Windows 9x and NT. Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. - Copyright (C) 2001 Ben Wing. + Copyright (C) 2001, 2002 Ben Wing. This file is part of XEmacs. @@ -179,13 +179,6 @@ #ifdef DEBUG_XEMACS #define USE_ASSERTIONS #define MEMORY_USAGE_STATS -#define ERROR_CHECK_EXTENTS -#define ERROR_CHECK_TYPECHECK -#define ERROR_CHECK_CHARBPOS -#define ERROR_CHECK_GC -#define ERROR_CHECK_MALLOC -#define ERROR_CHECK_BYTE_CODE -#define ERROR_CHECK_GLYPHS #endif /* DEBUG_XEMACS */ #define HAVE_DRAGNDROP
--- a/src/scrollbar-msw.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/scrollbar-msw.c Sun Mar 31 08:30:17 2002 +0000 @@ -30,16 +30,18 @@ #include <config.h> #include "lisp.h" -#include "console-msw.h" +#include "device.h" #include "elhash.h" #include "events.h" #include "frame.h" #include "opaque.h" -#include "scrollbar-msw.h" #include "scrollbar.h" #include "specifier.h" #include "window.h" +#include "console-msw.h" +#include "scrollbar-msw.h" + /* We use a similar sort of vertical scrollbar drag hack for mswindows * scrollbars as is used for Motif or Lucid scrollbars under X. * We do character-based instead of line-based scrolling, which can mean that
--- a/src/scrollbar-x.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/scrollbar-x.c Sun Mar 31 08:30:17 2002 +0000 @@ -28,14 +28,16 @@ #include <config.h> #include "lisp.h" +#include "device.h" +#include "frame.h" +#include "window.h" + #include "console-x.h" -#include "EmacsFrame.h" #include "glyphs-x.h" #include "gui-x.h" #include "scrollbar-x.h" -#include "frame.h" -#include "window.h" +#include "EmacsFrame.h" static void x_update_vertical_scrollbar_callback (Widget widget, LWLIB_ID id, XtPointer client_data);
--- a/src/select-msw.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/select-msw.c Sun Mar 31 08:30:17 2002 +0000 @@ -1,6 +1,6 @@ /* mswindows selection processing for XEmacs Copyright (C) 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc. - Copyright (C) 2000, 2001 Ben Wing. + Copyright (C) 2000, 2001, 2002 Ben Wing. This file is part of XEmacs. @@ -467,11 +467,10 @@ /* Microsoft, stupid Microsoft */ { - int size, new_size = 128; + int size = 64; do { - size = new_size; - new_size *= 2; + size *= 2; namebuf = alloca_extbytes (size * XETCHAR_SIZE); numchars = qxeGetClipboardFormatName (format, namebuf, size); }
--- a/src/select-x.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/select-x.c Sun Mar 31 08:30:17 2002 +0000 @@ -27,13 +27,15 @@ #include "lisp.h" #include "charset.h" +#include "device.h" +#include "frame.h" +#include "opaque.h" +#include "select.h" + #include "console-x.h" #include "objects-x.h" -#include "frame.h" -#include "opaque.h" #include "systime.h" -#include "select.h" int lisp_to_time (Lisp_Object, time_t *); Lisp_Object time_to_lisp (time_t);
--- a/src/signal.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/signal.c Sun Mar 31 08:30:17 2002 +0000 @@ -25,6 +25,7 @@ #include "lisp.h" #include "console.h" +#include "device.h" #include "events.h" /* for signal_fake_event() */ #include "frame.h" #include "process.h"
--- a/src/specifier.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/specifier.c Sun Mar 31 08:30:17 2002 +0000 @@ -32,13 +32,14 @@ #include "lisp.h" #include "buffer.h" +#include "chartab.h" #include "device.h" #include "frame.h" +#include "glyphs.h" #include "opaque.h" +#include "rangetab.h" #include "specifier.h" #include "window.h" -#include "chartab.h" -#include "rangetab.h" Lisp_Object Qspecifierp; Lisp_Object Qremove_tag_set_prepend, Qremove_tag_set_append; @@ -265,7 +266,6 @@ print_specifier (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { Lisp_Specifier *sp = XSPECIFIER (obj); - char buf[100]; int count = specpdl_depth (); Lisp_Object the_specs; @@ -273,8 +273,7 @@ printing_unreadable_object ("#<%s-specifier 0x%x>", sp->methods->name, sp->header.uid); - sprintf (buf, "#<%s-specifier global=", sp->methods->name); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "#<%s-specifier global=", sp->methods->name); specbind (Qprint_string_length, make_int (100)); specbind (Qprint_length, make_int (5)); the_specs = Fspecifier_specs (obj, Qglobal, Qnil, Qnil); @@ -285,12 +284,10 @@ print_internal (the_specs, printcharfun, 1); if (!NILP (sp->fallback)) { - write_c_string (" fallback=", printcharfun); - print_internal (sp->fallback, printcharfun, escapeflag); + write_fmt_string_lisp (printcharfun, " fallback=%S", 1, sp->fallback); } unbind_to (count); - sprintf (buf, " 0x%x>", sp->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " 0x%x>", sp->header.uid); } static void
--- a/src/specifier.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/specifier.h Sun Mar 31 08:30:17 2002 +0000 @@ -279,7 +279,7 @@ #define specifier_data_offset offsetof (Lisp_Specifier, data) extern const struct lrecord_description specifier_empty_extra_description[]; -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES #define DECLARE_SPECIFIER_TYPE(type) \ extern struct specifier_methods * type##_specifier_methods; \ INLINE_HEADER struct type##_specifier * \ @@ -310,7 +310,7 @@ #else #define DECLARE_SPECIFIER_TYPE(type) \ extern struct specifier_methods * type##_specifier_methods -#endif /* ERROR_CHECK_TYPECHECK */ +#endif /* ERROR_CHECK_TYPES */ #define DEFINE_SPECIFIER_TYPE(type) \ struct specifier_methods * type##_specifier_methods @@ -358,7 +358,7 @@ #define GHOST_SPECIFIER(sp) XSPECIFIER ((sp)->fallback) -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES # define SPECIFIER_TYPE_DATA(sp, type) \ error_check_##type##_specifier_data (sp) #else @@ -369,12 +369,12 @@ : (sp)->data)) #endif -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES # define XSPECIFIER_TYPE(x, type) \ error_check_##type##_specifier_type (x) #else # define XSPECIFIER_TYPE(x, type) XSPECIFIER (x) -#endif /* ERROR_CHECK_TYPE_CHECK */ +#endif /* ERROR_CHECK_TYPES */ #define SPECIFIER_TYPEP(x, type) \ (SPECIFIERP (x) && SPECIFIER_TYPE_P (XSPECIFIER (x), type))
--- a/src/symbols.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/symbols.c Sun Mar 31 08:30:17 2002 +0000 @@ -918,7 +918,7 @@ { struct symbol_value_buffer_local *bfwd; -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TYPES assert (XSYMBOL_VALUE_MAGIC_TYPE (obj) == SYMVAL_BUFFER_LOCAL || XSYMBOL_VALUE_MAGIC_TYPE (obj) == SYMVAL_SOME_BUFFER_LOCAL); #endif @@ -964,12 +964,11 @@ print_symbol_value_magic (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { - char buf[200]; - sprintf (buf, "#<INTERNAL OBJECT (XEmacs bug?) (%s type %d) 0x%lx>", - XRECORD_LHEADER_IMPLEMENTATION (obj)->name, - XSYMBOL_VALUE_MAGIC_TYPE (obj), - (long) XPNTR (obj)); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, + "#<INTERNAL OBJECT (XEmacs bug?) (%s type %d) 0x%lx>", + XRECORD_LHEADER_IMPLEMENTATION (obj)->name, + XSYMBOL_VALUE_MAGIC_TYPE (obj), + (long) XPNTR (obj)); } static const struct lrecord_description symbol_value_forward_description[] = {
--- a/src/sysdep.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/sysdep.c Sun Mar 31 08:30:17 2002 +0000 @@ -45,36 +45,39 @@ /* basic includes */ /* ------------------------------- */ + +#include "buffer.h" +#include "device.h" +#include "events.h" +#include "frame.h" +#include "process.h" +#include "redisplay.h" +#include "sysdep.h" +#include "window.h" + #ifdef HAVE_TTY #include "console-tty.h" #else -#include "syssignal.h" -#include "systty.h" #endif /* HAVE_TTY */ #include "console-stream.h" - -#include "buffer.h" -#include "events.h" -#include "frame.h" -#include "redisplay.h" -#include "process.h" -#include "sysdep.h" -#include "window.h" - -#include <setjmp.h> -#include "sysfile.h" -#include "syswait.h" -#include "sysdir.h" -#include "systime.h" -#include "syssignal.h" -#include "syspwd.h" -#include "sysproc.h" - #ifdef WIN32_NATIVE #include "syswindows.h" #endif +#include "sysdir.h" +#include "sysfile.h" +#include "sysproc.h" +#include "syspwd.h" +#include "syssignal.h" +#include "syssignal.h" +#include "systime.h" +#include "systty.h" +#include "syswait.h" + +#include <setjmp.h> + + /* ------------------------------- */ /* TTY definitions */ /* ------------------------------- */
--- a/src/syswindows.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/syswindows.h Sun Mar 31 08:30:17 2002 +0000 @@ -412,6 +412,11 @@ #endif #endif /* not BFFM_VALIDATEFAILED */ +/* winnls.h defines */ +#ifndef LOCALE_RETURN_NUMBER +#define LOCALE_RETURN_NUMBER 0x20000000 +#endif + /* OEM resources */ #ifndef OCR_ICOCUR #define OCR_ICOCUR 32647 @@ -485,67 +490,230 @@ /* See intl-encap-win32.c for more information about Unicode-encapsulation */ +#define ERROR_WHEN_NONINTERCEPTED_FUNS_USED + #include "intl-auto-encap-win32.h" /* would be encapsulatable but for parsing problems */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DefWindowProc +#define DefWindowProc error use qxeDefWindowProc or DefWindowProcA/DefWindowProcW +#endif LRESULT qxeDefWindowProc (HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CallWindowProc +#define CallWindowProc error use qxeCallWindowProc or CallWindowProcA/CallWindowProcW +#endif LRESULT qxeCallWindowProc (WNDPROC lpPrevWndFunc, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DefDlgProc +#define DefDlgProc error use qxeDefDlgProc or DefDlgProcA/DefDlgProcW +#endif LRESULT qxeDefDlgProc (HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SetWindowsHook +#define SetWindowsHook error use qxeSetWindowsHook or SetWindowsHookA/SetWindowsHookW +#endif HHOOK qxeSetWindowsHook (int nFilterType, HOOKPROC pfnFilterProc); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DefMDIChildProc +#define DefMDIChildProc error use qxeDefMDIChildProc or DefMDIChildProcA/DefMDIChildProcW +#endif LRESULT qxeDefMDIChildProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +#undef GetEnvironmentStrings +#undef GetEnvironmentStringsA +#define GetEnvironmentStringsA GetEnvironmentStrings +Extbyte * qxeGetEnvironmentStrings (void); + /* would be encapsulatable but for Cygwin problems */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegConnectRegistry +#define RegConnectRegistry error use qxeRegConnectRegistry or RegConnectRegistryA/RegConnectRegistryW +#endif LONG qxeRegConnectRegistry (const Extbyte * lpMachineName, HKEY hKey, PHKEY phkResult); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ExtractIconEx +#define ExtractIconEx error use qxeExtractIconEx or ExtractIconExA/ExtractIconExW +#endif UINT qxeExtractIconEx (const Extbyte * lpszFile, int nIconIndex, HICON FAR * phiconLarge, HICON FAR * phiconSmall, UINT nIcons); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetICMProfile +#define GetICMProfile error use qxeGetICMProfile or GetICMProfileA/GetICMProfileW +#endif BOOL qxeGetICMProfile (HDC arg1, LPDWORD arg2, Extbyte * arg3); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef UpdateICMRegKey +#define UpdateICMRegKey error use qxeUpdateICMRegKey or UpdateICMRegKeyA/UpdateICMRegKeyW +#endif BOOL qxeUpdateICMRegKey (DWORD arg1, Extbyte * arg2, Extbyte * arg3, UINT arg4); /* files */ +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef FindFirstFile +#define FindFirstFile error use qxeFindFirstFile or FindFirstFileA/FindFirstFileW +#endif HANDLE qxeFindFirstFile (const Extbyte *lpFileName, WIN32_FIND_DATAW *lpFindFileData); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef FindNextFile +#define FindNextFile error use qxeFindNextFile or FindNextFileA/FindNextFileW +#endif BOOL qxeFindNextFile (HANDLE hFindFile, WIN32_FIND_DATAW *lpFindFileData); /* shell */ +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SHGetFileInfo +#define SHGetFileInfo error use qxeSHGetFileInfo or SHGetFileInfoA/SHGetFileInfoW +#endif DWORD qxeSHGetFileInfo (const Extbyte *pszPath, DWORD dwFileAttributes, SHFILEINFOW *psfi, UINT cbFileInfo, UINT uFlags); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SHBrowseForFolder +#define SHBrowseForFolder error use qxeSHBrowseForFolder or SHBrowseForFolderA/SHBrowseForFolderW +#endif LPITEMIDLIST qxeSHBrowseForFolder (LPBROWSEINFOW lpbi); + +/* Not Unicode-split */ VOID qxeSHAddToRecentDocs (UINT uFlags, LPCVOID pv); + +/* Not Unicode-split */ VOID qxeSHChangeNotify (LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SHGetDataFromIDList +#define SHGetDataFromIDList error use qxeSHGetDataFromIDList or SHGetDataFromIDListA/SHGetDataFromIDListW +#endif HRESULT qxeSHGetDataFromIDList (IShellFolder *psf, LPCITEMIDLIST pidl, int nFormat, PVOID pv, int cb); /* devmode */ +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateDC +#define CreateDC error use qxeCreateDC or CreateDCA/CreateDCW +#endif HDC qxeCreateDC (const Extbyte *lpszDriver, const Extbyte *lpszDevice, const Extbyte *lpszOutput, CONST DEVMODEW *lpInitData); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ResetDC +#define ResetDC error use qxeResetDC or ResetDCA/ResetDCW +#endif HDC qxeResetDC (HDC hdc, CONST DEVMODEW *lpInitData); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef OpenPrinter +#define OpenPrinter error use qxeOpenPrinter or OpenPrinterA/OpenPrinterW +#endif DWORD qxeOpenPrinter (Extbyte *pPrinterName, LPHANDLE phPrinter, LPPRINTER_DEFAULTSW pDefaultconst); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef DocumentProperties +#define DocumentProperties error use qxeDocumentProperties or DocumentPropertiesA/DocumentPropertiesW +#endif LONG qxeDocumentProperties (HWND hWnd, HANDLE hPrinter, Extbyte *pDeviceName, DEVMODEW *pDevModeOutput, DEVMODEW *pDevModeInput, DWORD fMode); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef PrintDlg +#define PrintDlg error use qxePrintDlg or PrintDlgA/PrintDlgW +#endif BOOL qxePrintDlg (PRINTDLGW *lppd); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef PageSetupDlg +#define PageSetupDlg error use qxePageSetupDlg or PageSetupDlgA/PageSetupDlgW +#endif BOOL qxePageSetupDlg (PAGESETUPDLGW *lppd); /* fonts */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef EnumFontFamiliesEx +#define EnumFontFamiliesEx error use qxeEnumFontFamiliesEx or EnumFontFamiliesExA/EnumFontFamiliesExW +#endif int qxeEnumFontFamiliesEx (HDC hdc, LOGFONTW *lpLogfont, FONTENUMPROCW lpEnumFontFamProc, LPARAM lParam, DWORD dwFlags); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateFontIndirect +#define CreateFontIndirect error use qxeCreateFontIndirect or CreateFontIndirectA/CreateFontIndirectW +#endif HFONT qxeCreateFontIndirect (CONST LOGFONTW *lplf); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmSetCompositionFont +#define ImmSetCompositionFont error use qxeImmSetCompositionFont or ImmSetCompositionFontA/ImmSetCompositionFontW +#endif BOOL qxeImmSetCompositionFont (HIMC imc, LOGFONTW *lplf); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef ImmGetCompositionFont +#define ImmGetCompositionFont error use qxeImmGetCompositionFont or ImmGetCompositionFontA/ImmGetCompositionFontW +#endif BOOL qxeImmGetCompositionFont (HIMC imc, LOGFONTW *lplf); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetObject +#define GetObject error use qxeGetObject or GetObjectA/GetObjectW +#endif int qxeGetObject (HGDIOBJ hgdiobj, int cbBuffer, LPVOID lpvObject); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef GetTextMetrics +#define GetTextMetrics error use qxeGetTextMetrics or GetTextMetricsA/GetTextMetricsW +#endif BOOL qxeGetTextMetrics (HDC hdc, LPTEXTMETRICW lptm); /* COMMCTRL.H */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef SendMessage +#define SendMessage error use qxeSendMessage or SendMessageA/SendMessageW +#endif LRESULT qxeSendMessage (HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); /* windows */ + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegisterClass +#define RegisterClass error use qxeRegisterClass or RegisterClassA/RegisterClassW +#endif ATOM qxeRegisterClass (CONST WNDCLASSW * lpWndClass); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef UnregisterClass +#define UnregisterClass error use qxeUnregisterClass or UnregisterClassA/UnregisterClassW +#endif BOOL qxeUnregisterClass (const Extbyte * lpClassName, HINSTANCE hInstance); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef RegisterClassEx +#define RegisterClassEx error use qxeRegisterClassEx or RegisterClassExA/RegisterClassExW +#endif ATOM qxeRegisterClassEx (CONST WNDCLASSEXW * arg1); + +#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED +#undef CreateWindow +#define CreateWindow error use qxeCreateWindow or CreateWindowA/CreateWindowW +#endif #define qxeCreateWindow(lpClassName, lpWindowName, dwStyle, x, y, \ nWidth, nHeight, hWndParent, hMenu, hInstance, \ lpParam) \
--- a/src/text.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/text.c Sun Mar 31 08:30:17 2002 +0000 @@ -1274,7 +1274,7 @@ we will get no farther than here. This also catches len < 0. */ - charbpos_checking_assert (ptr == end); + text_checking_assert (ptr == end); return count; } @@ -1287,7 +1287,7 @@ { const Intbyte *newptr = ptr; - charbpos_checking_assert (len >= 0); + text_checking_assert (len >= 0); while (len > 0) { INC_CHARPTR (newptr); @@ -1405,7 +1405,7 @@ size = 1; } } -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT else if (x >= bufmin) abort (); #endif @@ -1683,7 +1683,7 @@ size = 1; } } -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT else if (x >= bytmin) abort (); #endif @@ -2031,7 +2031,7 @@ #endif /* MULE */ -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT Bytebpos charbpos_to_bytebpos (struct buffer *buf, Charbpos x) @@ -2048,7 +2048,7 @@ return real_bytebpos_to_charbpos (buf, x); } -#endif /* ERROR_CHECK_CHARBPOS */ +#endif /* ERROR_CHECK_TEXT */ /************************************************************************/ @@ -2522,7 +2522,7 @@ Dynarr_add (conversion_out_dynarr, (Extbyte) c); INC_CHARPTR (ptr); } - charbpos_checking_assert (ptr == end); + text_checking_assert (ptr == end); } #else Dynarr_add_many (conversion_out_dynarr, ptr, len); @@ -2600,7 +2600,8 @@ } streams_to_delete[delete_count++] = outstream = - make_coding_output_stream (XLSTREAM (outstream), coding_system, CODING_ENCODE); + make_coding_output_stream (XLSTREAM (outstream), coding_system, + CODING_ENCODE, 0); reader = XLSTREAM (instream); writer = XLSTREAM (outstream); @@ -2784,7 +2785,8 @@ } streams_to_delete[delete_count++] = outstream = - make_coding_output_stream (XLSTREAM (outstream), coding_system, CODING_DECODE); + make_coding_output_stream (XLSTREAM (outstream), coding_system, + CODING_DECODE, 0); reader = XLSTREAM (instream); writer = XLSTREAM (outstream); @@ -3015,7 +3017,7 @@ for (bytes = REP_BYTES_BY_FIRST_BYTE (ch) - 1; bytes; bytes--) { int c = Lstream_getc (stream); - charbpos_checking_assert (c >= 0); + text_checking_assert (c >= 0); *++strptr = (Intbyte) c; } return charptr_emchar (str);
--- a/src/text.h Sat Mar 30 04:46:48 2002 +0000 +++ b/src/text.h Sun Mar 31 08:30:17 2002 +0000 @@ -83,7 +83,7 @@ /* Number of bytes in the string representation of a character. */ -#ifdef ERROR_CHECK_TYPECHECK +#ifdef ERROR_CHECK_TEXT INLINE_HEADER int REP_BYTES_BY_FIRST_BYTE_1 (int fb, const char *file, int line); @@ -97,11 +97,11 @@ #define REP_BYTES_BY_FIRST_BYTE(fb) \ REP_BYTES_BY_FIRST_BYTE_1 (fb, __FILE__, __LINE__) -#else /* ERROR_CHECK_TYPECHECK */ +#else /* ERROR_CHECK_TEXT */ #define REP_BYTES_BY_FIRST_BYTE(fb) (rep_bytes_by_first_byte[fb]) -#endif /* ERROR_CHECK_TYPECHECK */ +#endif /* ERROR_CHECK_TEXT */ /* Is this character represented by more than one byte in a string? */ @@ -260,7 +260,7 @@ # define VALID_CHARPTR_P(ptr) 1 #endif -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT # define ASSERT_VALID_CHARPTR(ptr) assert (VALID_CHARPTR_P (ptr)) #else # define ASSERT_VALID_CHARPTR(ptr) @@ -283,7 +283,7 @@ (ptr)--; \ } while (!VALID_CHARPTR_P (ptr)) -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT #define INC_CHARPTR(ptr) do { \ ASSERT_VALID_CHARPTR (ptr); \ REAL_INC_CHARPTR (ptr); \ @@ -303,11 +303,11 @@ (ptr) = (Intbyte *) dc_ptr2; \ } while (0) -#else /* ! ERROR_CHECK_CHARBPOS */ +#else /* ! ERROR_CHECK_TEXT */ #define INC_CHARBYTEBPOS(ptr, pos) REAL_INC_CHARBYTEBPOS (ptr, pos) #define INC_CHARPTR(ptr) REAL_INC_CHARPTR (ptr) #define DEC_CHARPTR(ptr) REAL_DEC_CHARPTR (ptr) -#endif /* ! ERROR_CHECK_CHARBPOS */ +#endif /* ! ERROR_CHECK_TEXT */ #ifdef MULE @@ -1111,7 +1111,7 @@ memcpy ((ei)->data_, data, (ei)->bytelen_); \ } while (0) -#ifdef ERROR_CHECK_CHARBPOS +#ifdef ERROR_CHECK_TEXT #define EI_ASSERT_ASCII(ptr, len) \ do { \ int ei5; \ @@ -1349,17 +1349,17 @@ Intbyte *pos = eistr->data_ + bytepos; int i; - charbpos_checking_assert (bytepos >= 0 && bytepos <= eistr->bytelen_); - charbpos_checking_assert (n >= 0 && n <= eistr->charlen_); + text_checking_assert (bytepos >= 0 && bytepos <= eistr->bytelen_); + text_checking_assert (n >= 0 && n <= eistr->charlen_); /* We could check N more correctly now, but that would require a call to bytecount_to_charcount(), which would be needlessly expensive (it would convert O(N) algorithms into O(N^2) algorithms - with ERROR_CHECK_CHARBPOS, which would be bad). If N is bad, we are + with ERROR_CHECK_TEXT, which would be bad). If N is bad, we are guaranteed to catch it either inside INC_CHARPTR() or in the check below. */ for (i = 0; i < n; i++) INC_CHARPTR (pos); - charbpos_checking_assert (pos - eistr->data_ <= eistr->bytelen_); + text_checking_assert (pos - eistr->data_ <= eistr->bytelen_); return pos - eistr->data_; } @@ -1373,12 +1373,12 @@ Intbyte *pos = eistr->data_ + bytepos; int i; - charbpos_checking_assert (bytepos >= 0 && bytepos <= eistr->bytelen_); - charbpos_checking_assert (n >= 0 && n <= eistr->charlen_); + text_checking_assert (bytepos >= 0 && bytepos <= eistr->bytelen_); + text_checking_assert (n >= 0 && n <= eistr->charlen_); /* We could check N more correctly now, but ... see above. */ for (i = 0; i < n; i++) DEC_CHARPTR (pos); - charbpos_checking_assert (pos - eistr->data_ <= eistr->bytelen_); + text_checking_assert (pos - eistr->data_ <= eistr->bytelen_); return pos - eistr->data_; }
--- a/src/toolbar-common.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/toolbar-common.c Sun Mar 31 08:30:17 2002 +0000 @@ -26,8 +26,10 @@ #include <config.h> #include "lisp.h" +#include "device.h" #include "faces.h" #include "frame.h" +#include "glyphs.h" #include "toolbar.h" #include "window.h"
--- a/src/toolbar-msw.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/toolbar-msw.c Sun Mar 31 08:30:17 2002 +0000 @@ -35,12 +35,14 @@ #include <config.h> #include "lisp.h" +#include "device.h" +#include "elhash.h" #include "faces.h" #include "frame.h" +#include "gui.h" #include "toolbar.h" #include "window.h" -#include "gui.h" -#include "elhash.h" + #include "console-msw.h" #include "glyphs-msw.h" #include "objects-msw.h"
--- a/src/tooltalk.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/tooltalk.c Sun Mar 31 08:30:17 2002 +0000 @@ -164,14 +164,12 @@ { Lisp_Tooltalk_Message *p = XTOOLTALK_MESSAGE (obj); - char buf[200]; - if (print_readably) printing_unreadable_object ("#<tooltalk_message 0x%x>", p->header.uid); - sprintf (buf, "#<tooltalk_message id:0x%lx 0x%x>", (long) (p->m), p->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "#<tooltalk_message id:0x%lx 0x%x>", + (long) (p->m), p->header.uid); } DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-message", tooltalk_message, @@ -236,14 +234,12 @@ { Lisp_Tooltalk_Pattern *p = XTOOLTALK_PATTERN (obj); - char buf[200]; - if (print_readably) printing_unreadable_object ("#<tooltalk_pattern 0x%x>", p->header.uid); - sprintf (buf, "#<tooltalk_pattern id:0x%lx 0x%x>", (long) (p->p), p->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "#<tooltalk_pattern id:0x%lx 0x%x>", + (long) (p->p), p->header.uid); } DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-pattern", tooltalk_pattern,
--- a/src/ui-gtk.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/ui-gtk.c Sun Mar 31 08:30:17 2002 +0000 @@ -310,20 +310,13 @@ static void ffi_object_printer (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { - char buf[200]; - if (print_readably) printing_unreadable_object ("#<ffi %p>", XFFI (obj)->function_ptr); - write_c_string ("#<ffi ", printcharfun); - print_internal (XFFI (obj)->function_name, printcharfun, 1); + write_fmt_string_lisp (printcharfun, "#<ffi %S", 1, XFFI (obj)->function_name); if (XFFI (obj)->n_args) - { - sprintf (buf, " %d arguments", XFFI (obj)->n_args); - write_c_string (buf, printcharfun); - } - sprintf (buf, " %p>", (void *)XFFI (obj)->function_ptr); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " %d arguments", XFFI (obj)->n_args); + write_fmt_string (printcharfun, " %p>", (void *)XFFI (obj)->function_ptr); } DEFINE_LRECORD_IMPLEMENTATION ("ffi", emacs_ffi, @@ -775,8 +768,6 @@ static void emacs_gtk_object_printer (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { - char buf[200]; - if (print_readably) printing_unreadable_object ("#<GtkObject %p>", XGTK_OBJECT (obj)->object); @@ -785,8 +776,7 @@ write_c_string (gtk_type_name (GTK_OBJECT_TYPE (XGTK_OBJECT (obj)->object)), printcharfun); else write_c_string ("dead", printcharfun); - sprintf (buf, ") %p>", (void *) XGTK_OBJECT (obj)->object); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, ") %p>", (void *) XGTK_OBJECT (obj)->object); } static Lisp_Object @@ -1086,15 +1076,12 @@ static void emacs_gtk_boxed_printer (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { - char buf[200]; - if (print_readably) printing_unreadable_object ("#<GtkBoxed %p>", XGTK_BOXED (obj)->object); write_c_string ("#<GtkBoxed (", printcharfun); write_c_string (gtk_type_name (XGTK_BOXED (obj)->object_type), printcharfun); - sprintf (buf, ") %p>", (void *) XGTK_BOXED (obj)->object); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, ") %p>", (void *) XGTK_BOXED (obj)->object); } static int
--- a/src/unicode.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/unicode.c Sun Mar 31 08:30:17 2002 +0000 @@ -1113,7 +1113,7 @@ #endif /* MULE */ -DEFUN ("character-to-unicode", Fcharacter_to_unicode, 1, 1, 0, /* +DEFUN ("char-to-unicode", Fchar_to_unicode, 1, 1, 0, /* Convert character to Unicode codepoint. When there is no international support (i.e. MULE is not defined), this function simply does `char-to-int'. @@ -1128,7 +1128,7 @@ #endif /* MULE */ } -DEFUN ("unicode-to-character", Funicode_to_character, 1, 2, 0, /* +DEFUN ("unicode-to-char", Funicode_to_char, 1, 2, 0, /* Convert Unicode codepoint to character. CODE should be a non-negative integer. If CHARSETS is given, it should be a list of charsets, and only those @@ -2112,8 +2112,7 @@ static void unicode_print (Lisp_Object cs, Lisp_Object printcharfun, int escapeflag) { - write_c_string ("(", printcharfun); - print_internal (unicode_getprop (cs, Qtype), printcharfun, 0); + write_fmt_string_lisp (printcharfun, "(%s", 1, unicode_getprop (cs, Qtype)); if (XCODING_SYSTEM_UNICODE_LITTLE_ENDIAN (cs)) write_c_string (", little-endian", printcharfun); if (XCODING_SYSTEM_UNICODE_NEED_BOM (cs)) @@ -2155,8 +2154,8 @@ DEFSYMBOL (Qignore_first_column); #endif /* MULE */ - DEFSUBR (Fcharacter_to_unicode); - DEFSUBR (Funicode_to_character); + DEFSUBR (Fchar_to_unicode); + DEFSUBR (Funicode_to_char); DEFSYMBOL (Qunicode); DEFSYMBOL (Qucs_4);
--- a/src/window.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/window.c Sun Mar 31 08:30:17 2002 +0000 @@ -30,15 +30,16 @@ #include "lisp.h" #include "buffer.h" +#include "commands.h" +#include "device.h" +#include "elhash.h" #include "faces.h" #include "frame.h" +#include "glyphs.h" +#include "gutter.h" #include "objects.h" -#include "glyphs.h" #include "redisplay.h" #include "window.h" -#include "elhash.h" -#include "commands.h" -#include "gutter.h" Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configurationp; Lisp_Object Qdisplay_buffer; @@ -164,8 +165,6 @@ static void print_window (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { - char buf[200]; - if (print_readably) printing_unreadable_object ("#<window 0x%x>", XWINDOW (obj)->header.uid); @@ -173,11 +172,9 @@ if (!NILP (XWINDOW (obj)->buffer)) { Lisp_Object name = XBUFFER (XWINDOW (obj)->buffer)->name; - write_c_string (" on ", printcharfun); - print_internal (name, printcharfun, 1); + write_fmt_string_lisp (printcharfun, " on %S", 1, name); } - sprintf (buf, " 0x%x>", XWINDOW (obj)->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, " 0x%x>", XWINDOW (obj)->header.uid); } static void @@ -4889,6 +4886,8 @@ non-zero, the mapping is halted. Otherwise, map_windows() maps over all windows in F. + If F is null, map over all frames on all devices and consoles. + If MAPFUN creates or deletes windows, the behavior is undefined. */ int @@ -5156,13 +5155,11 @@ print_window_config (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { struct window_config *config = XWINDOW_CONFIGURATION (obj); - char buf[200]; if (print_readably) printing_unreadable_object ("#<window-configuration 0x%x>", config->header.uid); write_c_string ("#<window-configuration ", printcharfun); - sprintf (buf, "0x%x>", config->header.uid); - write_c_string (buf, printcharfun); + write_fmt_string (printcharfun, "0x%x>", config->header.uid); } DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION ("window-configuration",
--- a/tests/ChangeLog Sat Mar 30 04:46:48 2002 +0000 +++ b/tests/ChangeLog Sun Mar 31 08:30:17 2002 +0000 @@ -1,3 +1,8 @@ +2002-03-31 Ben Wing <ben@xemacs.org> + + * automated/mule-tests.el ((featurep 'mule)): + Fix for new Unicode support. + 2002-03-12 Ben Wing <ben@xemacs.org> * The Great Mule Merge: placeholder.
--- a/tests/automated/mule-tests.el Sat Mar 30 04:46:48 2002 +0000 +++ b/tests/automated/mule-tests.el Sun Mar 31 08:30:17 2002 +0000 @@ -321,10 +321,9 @@ (let* ((scaron (make-char 'latin-iso8859-2 57))) (loop for code in '(#x0000 #x2222 #x4444 #xffff) do (progn - (set-ucs-char code scaron) - (Assert (eq scaron (ucs-char code))))) + (set-unicode-conversion scaron code) + (Assert (eq code (char-to-unicode scaron))) + (Assert (eq scaron (unicode-to-char code '(latin-iso8859-2)))))) - (Assert (eq nil (set-ucs-char #x1ffff scaron))) - (Check-Error wrong-type-argument (set-ucs-char -10000 scaron))) - + (Check-Error wrong-type-argument (set-unicode-conversion scaron -10000))) )