Mercurial > hg > xemacs-beta
changeset 2286:04bc9d2f42c7
[xemacs-hg @ 2004-09-20 19:18:55 by james]
Mark all unused parameters as unused. Also eliminate some unneeded local
variables.
line wrap: on
line diff
--- a/ChangeLog Mon Sep 20 19:11:29 2004 +0000 +++ b/ChangeLog Mon Sep 20 19:20:08 2004 +0000 @@ -1,3 +1,8 @@ +2004-09-14 Jerry James <james@xemacs.org> + + * configure.in (TAB): Add unused parameter and variables warnings + to gcc CFLAGS. + 2004-09-20 Jerry James <james@xemacs.org> * INSTALL: Update Canna description to reflect recent changes.
--- a/configure Mon Sep 20 19:11:29 2004 +0000 +++ b/configure Mon Sep 20 19:20:08 2004 +0000 @@ -2928,6 +2928,8 @@ cflags_warning="-qinfo" elif test "$GCC" = "yes"; then cflags_warning="-Wall -Wno-switch -Winline -Wmissing-prototypes" + cflags_warning="$cflags_warning -Wunused-parameter -Wunused-variable" + cflags_warning="$cflags_warning -Wsign-compare" cflags_warning="$cflags_warning -Wundef -Wstrict-prototypes" if test "$__GCC3" = "yes"; then @@ -2946,7 +2948,7 @@ echo "$ac_t""${xe_cflags_warning}" 1>&6 echo $ac_n "checking for preferred warning flags for CC""... $ac_c" 1>&6 -echo "configure:2950: checking for preferred warning flags for CC" >&5 +echo "configure:2952: checking for preferred warning flags for CC" >&5 echo "$ac_t""${cflags_warning}" 1>&6 XE_CFLAGS="$xe_cflags_warning $CFLAGS" @@ -2954,7 +2956,7 @@ if test "$GCC" = "yes"; then echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6 -echo "configure:2958: checking for buggy gcc versions" >&5 +echo "configure:2960: 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.*) @@ -3012,7 +3014,7 @@ if test "$pdump" != "yes"; then echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6 -echo "configure:3016: checking for \"-z nocombreloc\" linker flag" >&5 +echo "configure:3018: 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 ;; @@ -3101,7 +3103,7 @@ fi echo $ac_n "checking for dynodump""... $ac_c" 1>&6 -echo "configure:3105: checking for dynodump" >&5 +echo "configure:3107: checking for dynodump" >&5 if test "$unexec" != "unexsol2.o"; then echo "$ac_t""no" 1>&6 else @@ -3138,12 +3140,12 @@ done echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6 -echo "configure:3142: checking for terminateAndUnload in -lC" >&5 +echo "configure:3144: 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 3147 "configure" +#line 3149 "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 @@ -3154,7 +3156,7 @@ terminateAndUnload() ; return 0; } EOF -if { (eval echo configure:3158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3160: \"$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 @@ -3196,7 +3198,7 @@ libc_version="" echo $ac_n "checking for compiler version information""... $ac_c" 1>&6 -echo "configure:3200: checking for compiler version information" >&5 +echo "configure:3202: checking for compiler version information" >&5 if test "$GCC" = "yes"; then compiler_version=`$XEMACS_CC --version | head -1` @@ -3247,7 +3249,7 @@ fi echo $ac_n "checking for standard C library version information""... $ac_c" 1>&6 -echo "configure:3251: checking for standard C library version information" >&5 +echo "configure:3253: checking for standard C library version information" >&5 case "$canonical" in *-*-linux*) @@ -3359,7 +3361,7 @@ if test "$add_runtime_path" = "yes"; then echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6 -echo "configure:3363: checking "for runtime libraries flag"" >&5 +echo "configure:3365: checking "for runtime libraries flag"" >&5 case "$opsys" in sol2 ) dash_r="-R" ;; decosf* | linux* | irix*) dash_r="-rpath " ;; @@ -3381,14 +3383,14 @@ done fi cat > conftest.$ac_ext <<EOF -#line 3385 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:3392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +#line 3387 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:3394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* dash_r="$try_dash_r" else @@ -3489,10 +3491,10 @@ fi after_morecore_hook_exists=yes echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6 -echo "configure:3493: checking for malloc_set_state" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3496 "configure" +echo "configure:3495: checking for malloc_set_state" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3498 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char malloc_set_state(); below. */ @@ -3515,7 +3517,7 @@ ; return 0; } EOF -if { (eval echo configure:3519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3521: \"$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 @@ -3535,16 +3537,16 @@ fi echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6 -echo "configure:3539: checking whether __after_morecore_hook exists" >&5 -cat > conftest.$ac_ext <<EOF -#line 3541 "configure" +echo "configure:3541: checking whether __after_morecore_hook exists" >&5 +cat > conftest.$ac_ext <<EOF +#line 3543 "configure" #include "confdefs.h" extern void (* __after_morecore_hook)(); int main() { __after_morecore_hook = 0 ; return 0; } EOF -if { (eval echo configure:3548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3550: \"$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 @@ -3600,7 +3602,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:3604: checking for $ac_word" >&5 +echo "configure:3606: checking for $ac_word" >&5 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -3655,7 +3657,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:3659: checking for a BSD compatible install" >&5 +echo "configure:3661: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" @@ -3709,7 +3711,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:3713: checking for $ac_word" >&5 +echo "configure:3715: checking for $ac_word" >&5 if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. @@ -3741,15 +3743,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3745: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3748 "configure" +echo "configure:3747: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3750 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3755: \"$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* @@ -3779,10 +3781,10 @@ done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3783: checking for sys/wait.h that is POSIX.1 compatible" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3786 "configure" +echo "configure:3785: checking for sys/wait.h that is POSIX.1 compatible" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3788 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -3798,7 +3800,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3822,10 +3824,10 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3826: checking for ANSI C header files" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3829 "configure" +echo "configure:3828: checking for ANSI C header files" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3831 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -3833,7 +3835,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3839: \"$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* @@ -3850,7 +3852,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 3854 "configure" +#line 3856 "configure" #include "confdefs.h" #include <string.h> EOF @@ -3868,7 +3870,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 3872 "configure" +#line 3874 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -3886,7 +3888,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 3890 "configure" +#line 3892 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3897,7 +3899,7 @@ exit (0); } EOF -if { (eval echo configure:3901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:3903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -3923,10 +3925,10 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3927: checking whether time.h and sys/time.h may both be included" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3930 "configure" +echo "configure:3929: checking whether time.h and sys/time.h may both be included" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3932 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -3935,7 +3937,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3959,10 +3961,10 @@ fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:3963: checking for sys_siglist declaration in signal.h or unistd.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3966 "configure" +echo "configure:3965: checking for sys_siglist declaration in signal.h or unistd.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3968 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -3974,7 +3976,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:3978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -4000,9 +4002,9 @@ echo $ac_n "checking for utime""... $ac_c" 1>&6 -echo "configure:4004: checking for utime" >&5 -cat > conftest.$ac_ext <<EOF -#line 4006 "configure" +echo "configure:4006: checking for utime" >&5 +cat > conftest.$ac_ext <<EOF +#line 4008 "configure" #include "confdefs.h" #include <sys/types.h> #include <utime.h> @@ -4010,7 +4012,7 @@ struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x); ; return 0; } EOF -if { (eval echo configure:4014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4016: \"$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 @@ -4029,10 +4031,10 @@ for ac_func in utimes do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4033: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4036 "configure" +echo "configure:4035: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4038 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4055,7 +4057,7 @@ ; return 0; } EOF -if { (eval echo configure:4059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4061: \"$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 @@ -4087,10 +4089,10 @@ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4091: checking return type of signal handlers" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4094 "configure" +echo "configure:4093: checking return type of signal handlers" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4096 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -4107,7 +4109,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:4111: \"$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* ac_cv_type_signal=void else @@ -4129,10 +4131,10 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:4133: checking for size_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4136 "configure" +echo "configure:4135: checking for size_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4138 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -4163,10 +4165,10 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:4167: checking for pid_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4170 "configure" +echo "configure:4169: checking for pid_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4172 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -4197,10 +4199,10 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:4201: checking for uid_t in sys/types.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4204 "configure" +echo "configure:4203: checking for uid_t in sys/types.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4206 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -4236,10 +4238,10 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:4240: checking for mode_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4243 "configure" +echo "configure:4242: checking for mode_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4245 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -4270,10 +4272,10 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:4274: checking for off_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4277 "configure" +echo "configure:4276: checking for off_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4279 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -4304,10 +4306,10 @@ fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:4308: checking for ssize_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4311 "configure" +echo "configure:4310: checking for ssize_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4313 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -4340,9 +4342,9 @@ if test "$ac_cv_header_inttypes_h" != "yes"; then echo $ac_n "checking for intptr_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:4344: checking for intptr_t in sys/types.h" >&5 -cat > conftest.$ac_ext <<EOF -#line 4346 "configure" +echo "configure:4346: checking for intptr_t in sys/types.h" >&5 +cat > conftest.$ac_ext <<EOF +#line 4348 "configure" #include "confdefs.h" #include <sys/types.h> intptr_t x; @@ -4351,7 +4353,7 @@ ; return 0; } EOF -if { (eval echo configure:4355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4357: \"$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 @@ -4372,9 +4374,9 @@ fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:4376: checking for socklen_t" >&5 -cat > conftest.$ac_ext <<EOF -#line 4378 "configure" +echo "configure:4378: checking for socklen_t" >&5 +cat > conftest.$ac_ext <<EOF +#line 4380 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -4384,7 +4386,7 @@ ; return 0; } EOF -if { (eval echo configure:4388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -4393,7 +4395,7 @@ rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 4397 "configure" +#line 4399 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -4403,7 +4405,7 @@ ; return 0; } EOF -if { (eval echo configure:4407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""size_t" 1>&6 @@ -4435,9 +4437,9 @@ rm -f conftest* echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:4439: checking for struct timeval" >&5 -cat > conftest.$ac_ext <<EOF -#line 4441 "configure" +echo "configure:4441: checking for struct timeval" >&5 +cat > conftest.$ac_ext <<EOF +#line 4443 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -4453,7 +4455,7 @@ static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:4457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -4475,10 +4477,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:4479: checking whether struct tm is in sys/time.h or time.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4482 "configure" +echo "configure:4481: checking whether struct tm is in sys/time.h or time.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4484 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -4486,7 +4488,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4510,10 +4512,10 @@ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4514: checking for tm_zone in struct tm" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4517 "configure" +echo "configure:4516: checking for tm_zone in struct tm" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4519 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -4521,7 +4523,7 @@ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -4544,10 +4546,10 @@ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4548: checking for tzname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4551 "configure" +echo "configure:4550: checking for tzname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4553 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -4557,7 +4559,7 @@ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4583,10 +4585,10 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4587: checking for working const" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4590 "configure" +echo "configure:4589: checking for working const" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4592 "configure" #include "confdefs.h" int main() { @@ -4635,7 +4637,7 @@ ; return 0; } EOF -if { (eval echo configure:4639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4660,7 +4662,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:4664: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:4666: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` cat > conftestmake <<\EOF @@ -4685,12 +4687,12 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4689: checking whether byte ordering is bigendian" >&5 +echo "configure:4691: 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 4694 "configure" +#line 4696 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -4701,11 +4703,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:4705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4707: \"$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 4709 "configure" +#line 4711 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -4716,7 +4718,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:4720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4733,7 +4735,7 @@ rm -f conftest* if test $ac_cv_c_bigendian = unknown; then cat > conftest.$ac_ext <<EOF -#line 4737 "configure" +#line 4739 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -4746,7 +4748,7 @@ exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:4750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_bigendian=no else @@ -4773,10 +4775,10 @@ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:4777: checking size of short" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4780 "configure" +echo "configure:4779: checking size of short" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4782 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -4787,7 +4789,7 @@ return(0); } EOF -if { (eval echo configure:4791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_short=`cat conftestval` else @@ -4815,10 +4817,10 @@ exit 1 fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:4819: checking size of int" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4822 "configure" +echo "configure:4821: checking size of int" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4824 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -4829,7 +4831,7 @@ return(0); } EOF -if { (eval echo configure:4833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_int=`cat conftestval` else @@ -4851,10 +4853,10 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:4855: checking size of long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4858 "configure" +echo "configure:4857: checking size of long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4860 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -4865,7 +4867,7 @@ return(0); } EOF -if { (eval echo configure:4869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_long=`cat conftestval` else @@ -4887,10 +4889,10 @@ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:4891: checking size of long long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4894 "configure" +echo "configure:4893: checking size of long long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4896 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -4901,7 +4903,7 @@ return(0); } EOF -if { (eval echo configure:4905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4907: \"$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 @@ -4923,10 +4925,10 @@ echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:4927: checking size of void *" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4930 "configure" +echo "configure:4929: checking size of void *" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4932 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -4937,7 +4939,7 @@ return(0); } EOF -if { (eval echo configure:4941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4943: \"$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 @@ -4959,10 +4961,10 @@ echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:4963: checking size of double" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4966 "configure" +echo "configure:4965: checking size of double" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4968 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -4973,7 +4975,7 @@ return(0); } EOF -if { (eval echo configure:4977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_double=`cat conftestval` else @@ -4996,7 +4998,7 @@ echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:5000: checking for long file names" >&5 +echo "configure:5002: 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: @@ -5042,10 +5044,10 @@ echo $ac_n "checking for sin""... $ac_c" 1>&6 -echo "configure:5046: checking for sin" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5049 "configure" +echo "configure:5048: checking for sin" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5051 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char sin(); below. */ @@ -5068,7 +5070,7 @@ ; return 0; } EOF -if { (eval echo configure:5072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5074: \"$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 @@ -5086,12 +5088,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:5090: checking for sin in -lm" >&5 +echo "configure:5092: 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 5095 "configure" +#line 5097 "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 @@ -5102,7 +5104,7 @@ sin() ; return 0; } EOF -if { (eval echo configure:5106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5108: \"$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 @@ -5137,14 +5139,14 @@ cat > conftest.$ac_ext <<EOF -#line 5141 "configure" +#line 5143 "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:5148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5150: \"$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 @@ -5163,10 +5165,10 @@ for ac_func in mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5167: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5170 "configure" +echo "configure:5169: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5172 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5189,7 +5191,7 @@ ; return 0; } EOF -if { (eval echo configure:5193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5195: \"$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 @@ -5218,14 +5220,14 @@ echo "checking type of mail spool file locking" 1>&6 -echo "configure:5222: checking type of mail spool file locking" >&5 +echo "configure:5224: 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:5226: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5229 "configure" +echo "configure:5228: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5231 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5248,7 +5250,7 @@ ; return 0; } EOF -if { (eval echo configure:5252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5254: \"$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 @@ -5330,12 +5332,12 @@ case "$opsys" in decosf*) echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:5334: checking for cma_open in -lpthreads" >&5 +echo "configure:5336: 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 5339 "configure" +#line 5341 "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 @@ -5346,7 +5348,7 @@ cma_open() ; return 0; } EOF -if { (eval echo configure:5350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5352: \"$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 @@ -5383,7 +5385,7 @@ echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:5387: checking whether the -xildoff compiler flag is required" >&5 +echo "configure:5389: 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; @@ -5395,7 +5397,7 @@ if test "$opsys" = "sol2"; then if test "$os_release" -ge 506; then echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6 -echo "configure:5399: checking for \"-z ignore\" linker flag" >&5 +echo "configure:5401: 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 ;; @@ -5406,7 +5408,7 @@ echo "checking "for specified window system"" 1>&6 -echo "configure:5410: checking "for specified window system"" >&5 +echo "configure:5412: checking "for specified window system"" >&5 GNOME_CONFIG=no @@ -5414,7 +5416,7 @@ if test "$with_gnome" != "no"; then echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6 -echo "configure:5418: checking for GNOME configuration script" >&5 +echo "configure:5420: checking for GNOME configuration script" >&5 for possible in gnome-config do possible_version=`${possible} --version 2> /dev/null` @@ -5445,7 +5447,7 @@ if test "$with_gtk" != "no";then echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6 -echo "configure:5449: checking for GTK configuration script" >&5 +echo "configure:5451: checking for GTK configuration script" >&5 for possible in gtk12-config gtk14-config gtk-config do possible_version=`${possible} --version 2> /dev/null` @@ -5467,18 +5469,18 @@ if test "${GTK_CONFIG}" != "no"; then echo $ac_n "checking gtk version""... $ac_c" 1>&6 -echo "configure:5471: checking gtk version" >&5 +echo "configure:5473: 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:5476: checking gtk libs" >&5 +echo "configure:5478: 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:5482: checking gtk cflags" >&5 +echo "configure:5484: checking gtk cflags" >&5 GTK_CFLAGS=`${GTK_CONFIG} --cflags` if test "$GCC" = "yes"; then GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow" @@ -5488,19 +5490,19 @@ echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6 -echo "configure:5492: checking for main in -lgdk_imlib" >&5 +echo "configure:5494: 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 5497 "configure" +#line 5499 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5506: \"$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 @@ -5522,12 +5524,12 @@ echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6 -echo "configure:5526: checking for Imlib_init in -lImlib" >&5 +echo "configure:5528: 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 5531 "configure" +#line 5533 "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 @@ -5538,7 +5540,7 @@ Imlib_init() ; return 0; } EOF -if { (eval echo configure:5542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5544: \"$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 @@ -5561,10 +5563,10 @@ for ac_func in gdk_imlib_init do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5565: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5568 "configure" +echo "configure:5567: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5570 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5587,7 +5589,7 @@ ; return 0; } EOF -if { (eval echo configure:5591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5593: \"$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 @@ -5671,15 +5673,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5675: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5678 "configure" +echo "configure:5677: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5680 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5685: \"$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* @@ -5710,19 +5712,19 @@ echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6 -echo "configure:5714: checking for main in -lxml" >&5 +echo "configure:5716: 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 5719 "configure" +#line 5721 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5728: \"$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 @@ -5744,19 +5746,19 @@ echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6 -echo "configure:5748: checking for main in -lglade" >&5 +echo "configure:5750: 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 5753 "configure" +#line 5755 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5762: \"$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 @@ -5778,19 +5780,19 @@ echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6 -echo "configure:5782: checking for main in -lglade-gnome" >&5 +echo "configure:5784: 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 5787 "configure" +#line 5789 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5796: \"$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 @@ -5811,7 +5813,7 @@ cat > conftest.$ac_ext <<EOF -#line 5815 "configure" +#line 5817 "configure" #include "confdefs.h" #include <glade/glade-xml.h> EOF @@ -5870,7 +5872,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:5874: checking for X" >&5 +echo "configure:5876: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5930,12 +5932,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 5934 "configure" +#line 5936 "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:5939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5941: \"$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* @@ -6004,14 +6006,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 6008 "configure" +#line 6010 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:6015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6017: \"$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. @@ -6120,17 +6122,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:6124: checking whether -R must be followed by a space" >&5 +echo "configure:6126: 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 6127 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:6134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +#line 6129 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:6136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -6146,14 +6148,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 6150 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:6157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +#line 6152 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:6159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -6189,12 +6191,12 @@ else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:6193: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:6195: 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 6198 "configure" +#line 6200 "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 @@ -6205,7 +6207,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:6209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6211: \"$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 @@ -6229,12 +6231,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:6233: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:6235: 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 6238 "configure" +#line 6240 "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 @@ -6245,7 +6247,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:6249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6251: \"$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 @@ -6274,10 +6276,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:6278: checking for gethostbyname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6281 "configure" +echo "configure:6280: checking for gethostbyname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6283 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -6300,7 +6302,7 @@ ; return 0; } EOF -if { (eval echo configure:6304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6306: \"$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 @@ -6321,12 +6323,12 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:6325: checking for gethostbyname in -lnsl" >&5 +echo "configure:6327: 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 6330 "configure" +#line 6332 "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 @@ -6337,7 +6339,7 @@ gethostbyname() ; return 0; } EOF -if { (eval echo configure:6341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6343: \"$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 @@ -6367,10 +6369,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:6371: checking for connect" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6374 "configure" +echo "configure:6373: checking for connect" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6376 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -6393,7 +6395,7 @@ ; return 0; } EOF -if { (eval echo configure:6397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6399: \"$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 @@ -6416,12 +6418,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:6420: checking "$xe_msg_checking"" >&5 +echo "configure:6422: 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 6425 "configure" +#line 6427 "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 @@ -6432,7 +6434,7 @@ connect() ; return 0; } EOF -if { (eval echo configure:6436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6438: \"$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 @@ -6456,10 +6458,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:6460: checking for remove" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6463 "configure" +echo "configure:6462: checking for remove" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6465 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -6482,7 +6484,7 @@ ; return 0; } EOF -if { (eval echo configure:6486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6488: \"$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 @@ -6503,12 +6505,12 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:6507: checking for remove in -lposix" >&5 +echo "configure:6509: 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 6512 "configure" +#line 6514 "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 @@ -6519,7 +6521,7 @@ remove() ; return 0; } EOF -if { (eval echo configure:6523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6525: \"$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 @@ -6543,10 +6545,10 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:6547: checking for shmat" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6550 "configure" +echo "configure:6549: checking for shmat" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6552 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -6569,7 +6571,7 @@ ; 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:6575: \"$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 @@ -6590,12 +6592,12 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:6594: checking for shmat in -lipc" >&5 +echo "configure:6596: 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 6599 "configure" +#line 6601 "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 @@ -6606,7 +6608,7 @@ shmat() ; return 0; } EOF -if { (eval echo configure:6610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6612: \"$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 @@ -6642,12 +6644,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:6646: checking "$xe_msg_checking"" >&5 +echo "configure:6648: 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 6651 "configure" +#line 6653 "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 @@ -6658,7 +6660,7 @@ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:6662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6664: \"$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 @@ -6704,15 +6706,15 @@ ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:6708: checking for Xm/Xm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6711 "configure" +echo "configure:6710: checking for Xm/Xm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6713 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6718: \"$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* @@ -6729,12 +6731,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:6733: checking for XmStringFree in -lXm" >&5 +echo "configure:6735: 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 6738 "configure" +#line 6740 "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 @@ -6745,7 +6747,7 @@ XmStringFree() ; return 0; } EOF -if { (eval echo configure:6749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6751: \"$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 @@ -6897,7 +6899,7 @@ echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:6901: checking for X defines extracted by xmkmf" >&5 +echo "configure:6903: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir @@ -6946,15 +6948,15 @@ ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:6950: checking for X11/Intrinsic.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6953 "configure" +echo "configure:6952: checking for X11/Intrinsic.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6955 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6960: \"$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* @@ -6978,12 +6980,12 @@ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:6982: checking for XOpenDisplay in -lX11" >&5 +echo "configure:6984: 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 6987 "configure" +#line 6989 "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 @@ -6994,7 +6996,7 @@ XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:6998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7000: \"$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 @@ -7019,12 +7021,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:7023: checking "$xe_msg_checking"" >&5 +echo "configure:7025: 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 7028 "configure" +#line 7030 "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 @@ -7035,7 +7037,7 @@ XGetFontProperty() ; return 0; } EOF -if { (eval echo configure:7039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7041: \"$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 @@ -7062,12 +7064,12 @@ echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:7066: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:7068: 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 7071 "configure" +#line 7073 "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 @@ -7078,7 +7080,7 @@ XShapeSelectInput() ; return 0; } EOF -if { (eval echo configure:7082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7084: \"$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 @@ -7101,12 +7103,12 @@ echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:7105: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:7107: 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 7110 "configure" +#line 7112 "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 @@ -7117,7 +7119,7 @@ XtOpenDisplay() ; return 0; } EOF -if { (eval echo configure:7121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7123: \"$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 @@ -7140,14 +7142,14 @@ echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:7144: checking the version of X11 being used" >&5 +echo "configure:7146: checking the version of X11 being used" >&5 cat > conftest.$ac_ext <<EOF -#line 7146 "configure" +#line 7148 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; } EOF -if { (eval echo configure:7151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest foobar; x11_release=$? else @@ -7178,10 +7180,10 @@ for ac_func in XConvertCase do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7182: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7185 "configure" +echo "configure:7184: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7187 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7204,7 +7206,7 @@ ; return 0; } EOF -if { (eval echo configure:7208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7210: \"$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 @@ -7236,15 +7238,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7240: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7243 "configure" +echo "configure:7242: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7245 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7250: \"$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* @@ -7277,10 +7279,10 @@ for ac_func in XRegisterIMInstantiateCallback do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7281: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7284 "configure" +echo "configure:7283: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7286 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7303,7 +7305,7 @@ ; return 0; } EOF -if { (eval echo configure:7307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7309: \"$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 @@ -7331,9 +7333,9 @@ done echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6 -echo "configure:7335: checking for standard XRegisterIMInstantiateCallback prototype" >&5 +echo "configure:7337: checking for standard XRegisterIMInstantiateCallback prototype" >&5 cat > conftest.$ac_ext <<EOF -#line 7337 "configure" +#line 7339 "configure" #include "confdefs.h" #define NeedFunctionPrototypes 1 @@ -7345,7 +7347,7 @@ ; return 0; } EOF -if { (eval echo configure:7349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -7366,12 +7368,12 @@ test -z "$with_xmu" && { echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6 -echo "configure:7370: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 +echo "configure:7372: 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 7375 "configure" +#line 7377 "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 @@ -7382,7 +7384,7 @@ XmuReadBitmapDataFromFile() ; return 0; } EOF -if { (eval echo configure:7386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7388: \"$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 @@ -7421,19 +7423,19 @@ echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:7425: checking for main in -lXbsd" >&5 +echo "configure:7427: 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 7430 "configure" +#line 7432 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7439: \"$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 @@ -7470,22 +7472,22 @@ fi if test "$with_msw" != "no"; then echo "checking for MS-Windows" 1>&6 -echo "configure:7474: checking for MS-Windows" >&5 +echo "configure:7476: checking for MS-Windows" >&5 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:7477: checking for main in -lgdi32" >&5 +echo "configure:7479: 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 7482 "configure" +#line 7484 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7491: \"$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 @@ -7536,12 +7538,12 @@ test "$with_widgets" != "no" && with_widgets=msw fi cat > conftest.$ac_ext <<EOF -#line 7540 "configure" +#line 7542 "configure" #include "confdefs.h" #include <fcntl.h> int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; } EOF -if { (eval echo configure:7545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7547: \"$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 @@ -7602,15 +7604,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:7606: checking for X11/extensions/shape.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7609 "configure" +echo "configure:7608: checking for X11/extensions/shape.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7611 "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:7614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7616: \"$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* @@ -7660,7 +7662,7 @@ esac echo "checking for WM_COMMAND option" 1>&6 -echo "configure:7664: checking for WM_COMMAND option" >&5; +echo "configure:7666: checking for WM_COMMAND option" >&5; if test "$with_wmcommand" != "no"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_WMCOMMAND @@ -7675,15 +7677,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:7679: checking for X11/Xauth.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7682 "configure" +echo "configure:7681: checking for X11/Xauth.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7684 "configure" #include "confdefs.h" #include <X11/Xauth.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7689: \"$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* @@ -7706,12 +7708,12 @@ } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:7710: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:7712: 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 7715 "configure" +#line 7717 "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 @@ -7722,7 +7724,7 @@ XauGetAuthByAddr() ; return 0; } EOF -if { (eval echo configure:7726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7728: \"$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 @@ -7773,7 +7775,7 @@ if test "$with_modules" != "no"; then echo "checking for module support" 1>&6 -echo "configure:7777: checking for module support" >&5 +echo "configure:7779: checking for module support" >&5 case "$opsys" in mingw* | cygwin* ) have_dl=yes ;; @@ -7790,15 +7792,15 @@ * ) ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:7794: checking for dlfcn.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7797 "configure" +echo "configure:7796: checking for dlfcn.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7799 "configure" #include "confdefs.h" #include <dlfcn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7804: \"$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* @@ -7815,16 +7817,16 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:7819: checking for dlopen in -lc" >&5 +echo "configure:7821: checking for dlopen in -lc" >&5 cat > conftest.$ac_ext <<EOF -#line 7821 "configure" +#line 7823 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:7828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -7833,18 +7835,18 @@ rm -rf conftest* echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:7837: checking for dlopen in -ldl" >&5 +echo "configure:7839: checking for dlopen in -ldl" >&5 ac_save_LIBS="$LIBS" LIBS="$LIBS -ldl" cat > conftest.$ac_ext <<EOF -#line 7841 "configure" +#line 7843 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:7848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -7853,17 +7855,17 @@ rm -rf conftest* echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 -echo "configure:7857: checking for dlopen in -lsvld" >&5 +echo "configure:7859: checking for dlopen in -lsvld" >&5 LIBS="$ac_save_LIBS -lsvld" cat > conftest.$ac_ext <<EOF -#line 7860 "configure" +#line 7862 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:7867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -7893,15 +7895,15 @@ else ac_safe=`echo "dl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dl.h""... $ac_c" 1>&6 -echo "configure:7897: checking for dl.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7900 "configure" +echo "configure:7899: checking for dl.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7902 "configure" #include "confdefs.h" #include <dl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7907: \"$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* @@ -7918,16 +7920,16 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for shl_load in -lc""... $ac_c" 1>&6 -echo "configure:7922: checking for shl_load in -lc" >&5 +echo "configure:7924: checking for shl_load in -lc" >&5 cat > conftest.$ac_ext <<EOF -#line 7924 "configure" +#line 7926 "configure" #include "confdefs.h" #include <dl.h> int main() { shl_load ("", 0, 0); ; return 0; } EOF -if { (eval echo configure:7931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -7936,18 +7938,18 @@ rm -rf conftest* echo $ac_n "checking for shl_load in -ldl""... $ac_c" 1>&6 -echo "configure:7940: checking for shl_load in -ldl" >&5 +echo "configure:7942: checking for shl_load in -ldl" >&5 ac_save_LIBS="$LIBS" LIBS="$LIBS -ldld" cat > conftest.$ac_ext <<EOF -#line 7944 "configure" +#line 7946 "configure" #include "confdefs.h" #include <dl.h> int main() { shl_load ("", 0, 0); ; return 0; } EOF -if { (eval echo configure:7951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -7975,15 +7977,15 @@ else ac_safe=`echo "ltdl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ltdl.h""... $ac_c" 1>&6 -echo "configure:7979: checking for ltdl.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7982 "configure" +echo "configure:7981: checking for ltdl.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7984 "configure" #include "confdefs.h" #include <ltdl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7989: \"$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* @@ -8000,18 +8002,18 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for lt_dlinit in -lltdl""... $ac_c" 1>&6 -echo "configure:8004: checking for lt_dlinit in -lltdl" >&5 +echo "configure:8006: checking for lt_dlinit in -lltdl" >&5 ac_save_LIBS="$LIBS" LIBS="$LIBS -lltdl" cat > conftest.$ac_ext <<EOF -#line 8008 "configure" +#line 8010 "configure" #include "confdefs.h" #include <ltdl.h> int main() { lt_dlinit (); ; return 0; } EOF -if { (eval echo configure:8015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -8052,7 +8054,7 @@ xealias=$internal_configuration echo "checking how to build dynamic libraries for ${xehost}" 1>&6 -echo "configure:8056: checking how to build dynamic libraries for ${xehost}" >&5 +echo "configure:8058: checking how to build dynamic libraries for ${xehost}" >&5 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; @@ -8080,9 +8082,9 @@ XEGCC=yes else echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:8084: checking checking whether we are using GNU C" >&5 +echo "configure:8086: checking checking whether we are using GNU C" >&5 cat > conftest.$ac_ext <<EOF -#line 8086 "configure" +#line 8088 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -8104,7 +8106,7 @@ fi echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6 -echo "configure:8108: checking how to produce PIC code" >&5 +echo "configure:8110: checking how to produce PIC code" >&5 wl= can_build_shared=yes @@ -8208,18 +8210,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:8212: checking if PIC flag ${dll_cflags} really works" >&5 +echo "configure:8214: checking if PIC flag ${dll_cflags} really works" >&5 save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $dll_cflags -DPIC" cat > conftest.$ac_ext <<EOF -#line 8216 "configure" +#line 8218 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:8223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8225: \"$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 @@ -8250,7 +8252,7 @@ xldf= xcldf= echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6 -echo "configure:8254: checking if C compiler can produce shared libraries" >&5 +echo "configure:8256: checking if C compiler can produce shared libraries" >&5 if test "$XEGCC" = yes -o "$__ICC" = yes; then case "$xehost_os" in *darwin*) @@ -8309,14 +8311,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 8313 "configure" +#line 8315 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:8320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cc_produces_so=yes else @@ -8341,7 +8343,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:8345: checking for ld used by GCC" >&5 +echo "configure:8347: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -8367,7 +8369,7 @@ esac else echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:8371: checking for GNU ld" >&5 +echo "configure:8373: checking for GNU ld" >&5 fi if test -z "$LTLD"; then @@ -8405,7 +8407,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:8409: checking if the linker is GNU ld" >&5 +echo "configure:8411: 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 @@ -8440,7 +8442,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:8444: checking whether the linker supports shared libraries" >&5 +echo "configure:8446: checking whether the linker supports shared libraries" >&5 dll_ld=$CC dll_ldflags=$LDFLAGS ld_shlibs=yes @@ -8653,10 +8655,10 @@ for ac_func in dlerror _dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8657: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8660 "configure" +echo "configure:8659: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8662 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8679,7 +8681,7 @@ ; return 0; } EOF -if { (eval echo configure:8683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8685: \"$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 @@ -8743,15 +8745,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:8747: checking for ${dir}tt_c.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8750 "configure" +echo "configure:8749: checking for ${dir}tt_c.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8752 "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:8755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8757: \"$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* @@ -8787,12 +8789,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:8791: checking "$xe_msg_checking"" >&5 +echo "configure:8793: 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 8796 "configure" +#line 8798 "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 @@ -8803,7 +8805,7 @@ tt_message_create() ; return 0; } EOF -if { (eval echo configure:8807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8809: \"$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 @@ -8857,15 +8859,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:8861: checking for Dt/Dt.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8864 "configure" +echo "configure:8863: checking for Dt/Dt.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8866 "configure" #include "confdefs.h" #include <Dt/Dt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8871: \"$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* @@ -8888,12 +8890,12 @@ } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:8892: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:8894: 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 8897 "configure" +#line 8899 "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 @@ -8904,7 +8906,7 @@ DtDndDragStart() ; return 0; } EOF -if { (eval echo configure:8908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8910: \"$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 @@ -8985,7 +8987,7 @@ if test "$with_dragndrop" != "no" ; then echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6 -echo "configure:8989: checking if drag and drop API is needed" >&5 +echo "configure:8991: 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 @@ -9005,19 +9007,19 @@ fi echo "checking for LDAP" 1>&6 -echo "configure:9009: checking for LDAP" >&5 +echo "configure:9011: checking for LDAP" >&5 ldap_libs= 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:9013: checking for ldap.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9016 "configure" +echo "configure:9015: checking for ldap.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9018 "configure" #include "confdefs.h" #include <ldap.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9023: \"$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* @@ -9040,15 +9042,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:9044: checking for lber.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9047 "configure" +echo "configure:9046: checking for lber.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9049 "configure" #include "confdefs.h" #include <lber.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9054: \"$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* @@ -9072,12 +9074,12 @@ if test "$with_ldap" != "no"; then echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6 -echo "configure:9076: checking for ldap_search in -lldap" >&5 +echo "configure:9078: 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 9081 "configure" +#line 9083 "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 @@ -9088,7 +9090,7 @@ ldap_search() ; return 0; } EOF -if { (eval echo configure:9092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9094: \"$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 @@ -9113,12 +9115,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:9117: checking "$xe_msg_checking"" >&5 +echo "configure:9119: 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 9122 "configure" +#line 9124 "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 @@ -9129,7 +9131,7 @@ ldap_open() ; return 0; } EOF -if { (eval echo configure:9133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9135: \"$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 @@ -9154,12 +9156,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:9158: checking "$xe_msg_checking"" >&5 +echo "configure:9160: 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 9163 "configure" +#line 9165 "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 @@ -9170,7 +9172,7 @@ ldap_open() ; return 0; } EOF -if { (eval echo configure:9174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9176: \"$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 @@ -9195,12 +9197,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:9199: checking "$xe_msg_checking"" >&5 +echo "configure:9201: 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 9204 "configure" +#line 9206 "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 @@ -9211,7 +9213,7 @@ ldap_open() ; return 0; } EOF -if { (eval echo configure:9215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9217: \"$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 @@ -9260,10 +9262,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:9264: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9267 "configure" +echo "configure:9266: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9269 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9286,7 +9288,7 @@ ; return 0; } EOF -if { (eval echo configure:9290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9292: \"$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 @@ -9325,20 +9327,20 @@ postgresql_libs= if test "$with_postgresql" != "no"; then echo "checking for PostgreSQL" 1>&6 -echo "configure:9329: checking for PostgreSQL" >&5 +echo "configure:9331: 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:9334: checking for ${header_dir}libpq-fe.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9337 "configure" +echo "configure:9336: checking for ${header_dir}libpq-fe.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9339 "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:9342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9344: \"$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* @@ -9362,12 +9364,12 @@ test -n "$libpq_fe_h_file" && { echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6 -echo "configure:9366: checking for PQconnectdb in -lpq" >&5 +echo "configure:9368: 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 9371 "configure" +#line 9373 "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 @@ -9378,7 +9380,7 @@ PQconnectdb() ; return 0; } EOF -if { (eval echo configure:9382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9384: \"$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 @@ -9411,12 +9413,12 @@ echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6 -echo "configure:9415: checking for PQconnectStart in -lpq" >&5 +echo "configure:9417: 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 9420 "configure" +#line 9422 "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 @@ -9427,7 +9429,7 @@ PQconnectStart() ; return 0; } EOF -if { (eval echo configure:9431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9433: \"$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 @@ -9478,7 +9480,7 @@ if test "$window_system" != "none"; then echo "checking for graphics libraries" 1>&6 -echo "configure:9482: checking for graphics libraries" >&5 +echo "configure:9484: checking for graphics libraries" >&5 libpath_xpm= incpath_xpm= @@ -9504,10 +9506,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:9508: checking for Xpm - no older than 3.4f" >&5 +echo "configure:9510: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 9511 "configure" +#line 9513 "configure" #include "confdefs.h" #define XPM_NUMBERS #include <X11/xpm.h> @@ -9516,7 +9518,7 @@ XpmIncludeVersion != XpmLibraryVersion() ? 1 : XpmIncludeVersion < 30406 ? 2 : 0 ;} EOF -if { (eval echo configure:9520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9522: \"$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 @@ -9560,17 +9562,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:9564: checking for \"FOR_MSW\" xpm" >&5 +echo "configure:9566: checking for \"FOR_MSW\" xpm" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 9567 "configure" +#line 9569 "configure" #include "confdefs.h" int main() { XpmCreatePixmapFromData() ; return 0; } EOF -if { (eval echo configure:9574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xpm_for_msw=no else @@ -9596,15 +9598,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:9600: checking for compface.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9603 "configure" +echo "configure:9602: checking for compface.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9605 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9610: \"$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* @@ -9627,12 +9629,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:9631: checking for UnGenFace in -lcompface" >&5 +echo "configure:9633: 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 9636 "configure" +#line 9638 "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 @@ -9643,7 +9645,7 @@ UnGenFace() ; return 0; } EOF -if { (eval echo configure:9647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9649: \"$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 @@ -9692,12 +9694,12 @@ if test "$with_png $with_tiff" != "no no"; then echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6 -echo "configure:9696: checking for inflate in -lc" >&5 +echo "configure:9698: 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 9701 "configure" +#line 9703 "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 @@ -9708,7 +9710,7 @@ inflate() ; return 0; } EOF -if { (eval echo configure:9712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9714: \"$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 @@ -9727,12 +9729,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:9731: checking for inflate in -lz" >&5 +echo "configure:9733: 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 9736 "configure" +#line 9738 "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 @@ -9743,7 +9745,7 @@ inflate() ; return 0; } EOF -if { (eval echo configure:9747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9749: \"$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 @@ -9762,12 +9764,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6 -echo "configure:9766: checking for inflate in -lgz" >&5 +echo "configure:9768: 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 9771 "configure" +#line 9773 "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 @@ -9778,7 +9780,7 @@ inflate() ; return 0; } EOF -if { (eval echo configure:9782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9784: \"$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 @@ -9808,15 +9810,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:9812: checking for jpeglib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9815 "configure" +echo "configure:9814: checking for jpeglib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9817 "configure" #include "confdefs.h" #include <jpeglib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9822: \"$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* @@ -9839,12 +9841,12 @@ } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:9843: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:9845: 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 9848 "configure" +#line 9850 "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 @@ -9855,7 +9857,7 @@ jpeg_destroy_decompress() ; return 0; } EOF -if { (eval echo configure:9859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9861: \"$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 @@ -9891,10 +9893,10 @@ png_problem="" test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:9895: checking for pow" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9898 "configure" +echo "configure:9897: checking for pow" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9900 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pow(); below. */ @@ -9917,7 +9919,7 @@ ; return 0; } EOF -if { (eval echo configure:9921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9923: \"$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 @@ -9938,15 +9940,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:9942: checking for png.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9945 "configure" +echo "configure:9944: checking for png.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9947 "configure" #include "confdefs.h" #include <png.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9952: \"$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* @@ -9969,12 +9971,12 @@ } test -z "$with_png" && { echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:9973: checking for png_read_image in -lpng" >&5 +echo "configure:9975: 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 9978 "configure" +#line 9980 "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 @@ -9985,7 +9987,7 @@ png_read_image() ; return 0; } EOF -if { (eval echo configure:9989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9991: \"$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 @@ -10008,10 +10010,10 @@ } if test -z "$with_png"; then echo $ac_n "checking for workable png version information""... $ac_c" 1>&6 -echo "configure:10012: checking for workable png version information" >&5 +echo "configure:10014: checking for workable png version information" >&5 xe_check_libs="-lpng -lz" cat > conftest.$ac_ext <<EOF -#line 10015 "configure" +#line 10017 "configure" #include "confdefs.h" #include <png.h> int main(int c, char **v) { @@ -10019,7 +10021,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:10023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:10025: \"$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 @@ -10062,15 +10064,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:10066: checking for tiffio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10069 "configure" +echo "configure:10068: checking for tiffio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10071 "configure" #include "confdefs.h" #include <tiffio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10076: \"$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* @@ -10093,12 +10095,12 @@ } test -z "$with_tiff" && { echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:10097: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:10099: 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 10102 "configure" +#line 10104 "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 @@ -10109,7 +10111,7 @@ TIFFClientOpen() ; return 0; } EOF -if { (eval echo configure:10113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10115: \"$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 @@ -10148,15 +10150,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:10152: checking for compface.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10155 "configure" +echo "configure:10154: checking for compface.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10157 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10162: \"$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* @@ -10179,12 +10181,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:10183: checking for UnGenFace in -lcompface" >&5 +echo "configure:10185: 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 10188 "configure" +#line 10190 "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 @@ -10195,7 +10197,7 @@ UnGenFace() ; return 0; } EOF -if { (eval echo configure:10199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10201: \"$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 @@ -10234,7 +10236,7 @@ if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:10238: checking for X11 graphics libraries" >&5 +echo "configure:10240: checking for X11 graphics libraries" >&5 fi case "$with_widgets" in @@ -10244,7 +10246,7 @@ if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then echo "checking for the Athena widgets" 1>&6 -echo "configure:10248: checking for the Athena widgets" >&5 +echo "configure:10250: checking for the Athena widgets" >&5 case "$with_athena" in "xaw" | "") athena_variant=Xaw athena_3d=no ;; @@ -10258,12 +10260,12 @@ if test "$athena_3d" = "no"; then echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:10262: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 +echo "configure:10264: 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 10267 "configure" +#line 10269 "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 @@ -10274,7 +10276,7 @@ XawScrollbarSetThumb() ; return 0; } EOF -if { (eval echo configure:10278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10280: \"$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 @@ -10290,12 +10292,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:10294: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:10296: 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 10299 "configure" +#line 10301 "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 @@ -10306,7 +10308,7 @@ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:10310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10312: \"$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 @@ -10337,12 +10339,12 @@ else echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:10341: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:10343: 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 10346 "configure" +#line 10348 "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 @@ -10353,7 +10355,7 @@ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:10357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10359: \"$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 @@ -10371,12 +10373,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6 -echo "configure:10375: checking for threeDClassRec in -lXaw" >&5 +echo "configure:10377: 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 10380 "configure" +#line 10382 "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 @@ -10387,7 +10389,7 @@ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:10391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10393: \"$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 @@ -10418,15 +10420,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:10422: checking for X11/Xaw/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10425 "configure" +echo "configure:10424: checking for X11/Xaw/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10427 "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:10430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10432: \"$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* @@ -10446,15 +10448,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:10450: checking for X11/Xaw/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10453 "configure" +echo "configure:10452: checking for X11/Xaw/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10455 "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:10458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10460: \"$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* @@ -10480,15 +10482,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:10484: checking for X11/$athena_variant/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10487 "configure" +echo "configure:10486: checking for X11/$athena_variant/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10489 "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:10492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10494: \"$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* @@ -10505,15 +10507,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:10509: checking for X11/$athena_variant/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10512 "configure" +echo "configure:10511: checking for X11/$athena_variant/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10514 "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:10517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10519: \"$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* @@ -10541,15 +10543,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:10545: checking for $athena_variant/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10548 "configure" +echo "configure:10547: checking for $athena_variant/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10550 "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:10553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10555: \"$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* @@ -10566,15 +10568,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:10570: checking for $athena_variant/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10573 "configure" +echo "configure:10572: checking for $athena_variant/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10575 "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:10578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10580: \"$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* @@ -10603,15 +10605,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:10607: checking for X11/Xaw3d/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10610 "configure" +echo "configure:10609: checking for X11/Xaw3d/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10612 "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:10615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10617: \"$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* @@ -10628,15 +10630,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:10632: checking for X11/Xaw3d/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10635 "configure" +echo "configure:10634: checking for X11/Xaw3d/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10637 "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:10640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10642: \"$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* @@ -10668,15 +10670,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:10672: checking for Xaw3d/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10675 "configure" +echo "configure:10674: checking for Xaw3d/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10677 "configure" #include "confdefs.h" #include <Xaw3d/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10682: \"$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* @@ -10693,15 +10695,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:10697: checking for Xaw3d/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10700 "configure" +echo "configure:10699: checking for Xaw3d/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10702 "configure" #include "confdefs.h" #include <Xaw3d/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10707: \"$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* @@ -10733,15 +10735,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:10737: checking for X11/Xaw/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10740 "configure" +echo "configure:10739: checking for X11/Xaw/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10742 "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:10745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10747: \"$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* @@ -10780,15 +10782,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:10784: checking for Xm/Xm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10787 "configure" +echo "configure:10786: checking for Xm/Xm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10789 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10794: \"$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* @@ -10805,12 +10807,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:10809: checking for XmStringFree in -lXm" >&5 +echo "configure:10811: 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 10814 "configure" +#line 10816 "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 @@ -10821,7 +10823,7 @@ XmStringFree() ; return 0; } EOF -if { (eval echo configure:10825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10827: \"$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 @@ -10850,9 +10852,9 @@ if test "$have_motif" = "yes"; then echo $ac_n "checking for Lesstif""... $ac_c" 1>&6 -echo "configure:10854: checking for Lesstif" >&5 +echo "configure:10856: checking for Lesstif" >&5 cat > conftest.$ac_ext <<EOF -#line 10856 "configure" +#line 10858 "configure" #include "confdefs.h" #include <Xm/Xm.h> #ifdef LESSTIF_VERSION @@ -11225,7 +11227,7 @@ if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:11229: checking for Mule-related features" >&5 +echo "configure:11231: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -11239,15 +11241,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11243: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11246 "configure" +echo "configure:11245: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11248 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11253: \"$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* @@ -11278,12 +11280,12 @@ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:11282: checking for strerror in -lintl" >&5 +echo "configure:11284: 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 11287 "configure" +#line 11289 "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 @@ -11294,7 +11296,7 @@ strerror() ; return 0; } EOF -if { (eval echo configure:11298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11300: \"$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 @@ -11327,18 +11329,18 @@ echo "checking for Mule input methods" 1>&6 -echo "configure:11331: checking for Mule input methods" >&5 +echo "configure:11333: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:11334: checking for XIM" >&5 +echo "configure:11336: checking for XIM" >&5 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6 -echo "configure:11337: checking for XOpenIM in -lX11" >&5 +echo "configure:11339: 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 11342 "configure" +#line 11344 "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 @@ -11349,7 +11351,7 @@ XOpenIM() ; return 0; } EOF -if { (eval echo configure:11353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11355: \"$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 @@ -11373,12 +11375,12 @@ if test "$have_motif $have_lesstif" = "yes no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:11377: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:11379: 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 11382 "configure" +#line 11384 "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 @@ -11389,7 +11391,7 @@ XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:11393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11395: \"$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 @@ -11454,15 +11456,15 @@ if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:11458: checking for XFontSet" >&5 +echo "configure:11460: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:11461: checking for XmbDrawString in -lX11" >&5 +echo "configure:11463: 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 11466 "configure" +#line 11468 "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 @@ -11473,7 +11475,7 @@ XmbDrawString() ; return 0; } EOF -if { (eval echo configure:11477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11479: \"$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 @@ -11513,15 +11515,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:11517: checking for wnn/jllib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11520 "configure" +echo "configure:11519: checking for wnn/jllib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11522 "configure" #include "confdefs.h" #include <wnn/jllib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11527: \"$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* @@ -11544,15 +11546,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:11548: checking for wnn/commonhd.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11551 "configure" +echo "configure:11550: checking for wnn/commonhd.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11553 "configure" #include "confdefs.h" #include <wnn/commonhd.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11558: \"$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* @@ -11577,10 +11579,10 @@ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11581: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11584 "configure" +echo "configure:11583: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11586 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11603,7 +11605,7 @@ ; return 0; } EOF -if { (eval echo configure:11607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11609: \"$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 @@ -11632,12 +11634,12 @@ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:11636: checking for crypt in -lcrypt" >&5 +echo "configure:11638: 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 11641 "configure" +#line 11643 "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 @@ -11648,7 +11650,7 @@ crypt() ; return 0; } EOF -if { (eval echo configure:11652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11654: \"$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 @@ -11683,12 +11685,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:11687: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:11689: 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 11692 "configure" +#line 11694 "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 @@ -11699,7 +11701,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:11703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11705: \"$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 @@ -11717,12 +11719,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:11721: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:11723: 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 11726 "configure" +#line 11728 "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 @@ -11733,7 +11735,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:11737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11739: \"$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 @@ -11751,12 +11753,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:11755: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:11757: 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 11760 "configure" +#line 11762 "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 @@ -11767,7 +11769,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:11771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11773: \"$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 @@ -11785,12 +11787,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:11789: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:11791: 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 11794 "configure" +#line 11796 "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 @@ -11801,7 +11803,7 @@ dic_list_e() ; return 0; } EOF -if { (eval echo configure:11805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11807: \"$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 @@ -11846,12 +11848,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:11850: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:11852: 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 11855 "configure" +#line 11857 "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 @@ -11862,7 +11864,7 @@ jl_fi_dic_list() ; return 0; } EOF -if { (eval echo configure:11866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11868: \"$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 @@ -11897,15 +11899,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:11901: checking for canna/jrkanji.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11904 "configure" +echo "configure:11903: checking for canna/jrkanji.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11906 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11911: \"$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* @@ -11932,15 +11934,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:11936: checking for canna/jrkanji.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11939 "configure" +echo "configure:11938: checking for canna/jrkanji.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11941 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11946: \"$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* @@ -11968,15 +11970,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:11972: checking for canna/RK.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11975 "configure" +echo "configure:11974: checking for canna/RK.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11977 "configure" #include "confdefs.h" #include <canna/RK.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11982: \"$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* @@ -11999,12 +12001,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:12003: checking for RkBgnBun in -lRKC" >&5 +echo "configure:12005: 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 12008 "configure" +#line 12010 "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 @@ -12015,7 +12017,7 @@ RkBgnBun() ; return 0; } EOF -if { (eval echo configure:12019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12021: \"$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 @@ -12038,12 +12040,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:12042: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:12044: 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 12047 "configure" +#line 12049 "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 @@ -12054,7 +12056,7 @@ jrKanjiControl() ; return 0; } EOF -if { (eval echo configure:12058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12060: \"$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 @@ -12100,12 +12102,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:12104: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:12106: 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 12109 "configure" +#line 12111 "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 @@ -12116,7 +12118,7 @@ layout_object_getvalue() ; return 0; } EOF -if { (eval echo configure:12120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12122: \"$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 @@ -12203,10 +12205,10 @@ for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize getrlimit 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 strlwr strupr symlink tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask wcslen wcscmp vlimit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12207: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12210 "configure" +echo "configure:12209: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12212 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12229,7 +12231,7 @@ ; return 0; } EOF -if { (eval echo configure:12233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12235: \"$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 @@ -12270,10 +12272,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:12274: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12277 "configure" +echo "configure:12276: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12279 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12296,7 +12298,7 @@ ; return 0; } EOF -if { (eval echo configure:12300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12302: \"$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 @@ -12325,10 +12327,10 @@ echo $ac_n "checking for openpty""... $ac_c" 1>&6 -echo "configure:12329: checking for openpty" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12332 "configure" +echo "configure:12331: checking for openpty" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12334 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char openpty(); below. */ @@ -12351,7 +12353,7 @@ ; return 0; } EOF -if { (eval echo configure:12355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12357: \"$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 @@ -12370,12 +12372,12 @@ echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:12374: checking for openpty in -lutil" >&5 +echo "configure:12376: 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 12379 "configure" +#line 12381 "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 @@ -12386,7 +12388,7 @@ openpty() ; return 0; } EOF -if { (eval echo configure:12390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12392: \"$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 @@ -12421,15 +12423,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12425: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12428 "configure" +echo "configure:12427: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12430 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12435: \"$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* @@ -12466,15 +12468,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12470: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12473 "configure" +echo "configure:12472: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12475 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12478: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12480: \"$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* @@ -12507,15 +12509,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12511: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12514 "configure" +echo "configure:12513: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12516 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12521: \"$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* @@ -12548,15 +12550,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12552: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12555 "configure" +echo "configure:12554: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12557 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12562: \"$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* @@ -12592,15 +12594,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12596: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12599 "configure" +echo "configure:12598: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12601 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12606: \"$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* @@ -12633,10 +12635,10 @@ for ac_func in isastream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12637: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12640 "configure" +echo "configure:12639: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12642 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12659,7 +12661,7 @@ ; return 0; } EOF -if { (eval echo configure:12663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12665: \"$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 @@ -12690,15 +12692,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12694: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12697 "configure" +echo "configure:12696: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12699 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12704: \"$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* @@ -12731,10 +12733,10 @@ for ac_func in getloadavg do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12735: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12738 "configure" +echo "configure:12737: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12740 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12757,7 +12759,7 @@ ; return 0; } EOF -if { (eval echo configure:12761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12763: \"$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 @@ -12790,15 +12792,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12794: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12797 "configure" +echo "configure:12796: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12799 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12804: \"$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* @@ -12834,12 +12836,12 @@ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:12838: checking for kstat_open in -lkstat" >&5 +echo "configure:12840: 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 12843 "configure" +#line 12845 "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 @@ -12850,7 +12852,7 @@ kstat_open() ; return 0; } EOF -if { (eval echo configure:12854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12856: \"$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 @@ -12885,15 +12887,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12889: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12892 "configure" +echo "configure:12891: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12894 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12899: \"$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* @@ -12925,12 +12927,12 @@ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:12929: checking for kvm_read in -lkvm" >&5 +echo "configure:12931: 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 12934 "configure" +#line 12936 "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 @@ -12941,7 +12943,7 @@ kvm_read() ; return 0; } EOF -if { (eval echo configure:12945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12947: \"$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 @@ -12975,16 +12977,16 @@ fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:12979: checking whether netdb declares h_errno" >&5 -cat > conftest.$ac_ext <<EOF -#line 12981 "configure" +echo "configure:12981: checking whether netdb declares h_errno" >&5 +cat > conftest.$ac_ext <<EOF +#line 12983 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:12988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12990: \"$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 @@ -13004,16 +13006,16 @@ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:13008: checking for sigsetjmp" >&5 -cat > conftest.$ac_ext <<EOF -#line 13010 "configure" +echo "configure:13010: checking for sigsetjmp" >&5 +cat > conftest.$ac_ext <<EOF +#line 13012 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:13017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13019: \"$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 @@ -13033,11 +13035,11 @@ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:13037: checking whether localtime caches TZ" >&5 +echo "configure:13039: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 13041 "configure" +#line 13043 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS @@ -13072,7 +13074,7 @@ exit (0); } EOF -if { (eval echo configure:13076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else @@ -13102,9 +13104,9 @@ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:13106: checking whether gettimeofday accepts one or two arguments" >&5 -cat > conftest.$ac_ext <<EOF -#line 13108 "configure" +echo "configure:13108: checking whether gettimeofday accepts one or two arguments" >&5 +cat > conftest.$ac_ext <<EOF +#line 13110 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME @@ -13125,7 +13127,7 @@ ; return 0; } EOF -if { (eval echo configure:13129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13131: \"$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 @@ -13147,19 +13149,19 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:13151: checking for inline" >&5 +echo "configure:13153: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 13156 "configure" +#line 13158 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:13163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -13196,16 +13198,16 @@ fi echo $ac_n "checking for typeof""... $ac_c" 1>&6 -echo "configure:13200: checking for typeof" >&5 -cat > conftest.$ac_ext <<EOF -#line 13202 "configure" +echo "configure:13202: checking for typeof" >&5 +cat > conftest.$ac_ext <<EOF +#line 13204 "configure" #include "confdefs.h" int main() { int i; __typeof__(i) j; ; return 0; } EOF -if { (eval echo configure:13209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* typeofname="__typeof__" else @@ -13213,14 +13215,14 @@ cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 13217 "configure" +#line 13219 "configure" #include "confdefs.h" int main() { int i; typeof(i) j; ; return 0; } EOF -if { (eval echo configure:13224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* typeofname="typeof" else @@ -13249,17 +13251,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:13253: checking for working alloca.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13256 "configure" +echo "configure:13255: checking for working alloca.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13258 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:13263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13265: \"$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 @@ -13283,10 +13285,10 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:13287: checking for alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13290 "configure" +echo "configure:13289: checking for alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13292 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -13314,7 +13316,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:13318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13320: \"$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 @@ -13353,10 +13355,10 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:13357: checking whether alloca needs Cray hooks" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13360 "configure" +echo "configure:13359: checking whether alloca needs Cray hooks" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13362 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -13380,10 +13382,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:13384: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13387 "configure" +echo "configure:13386: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13389 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -13406,7 +13408,7 @@ ; return 0; } EOF -if { (eval echo configure:13410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13412: \"$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 @@ -13436,10 +13438,10 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:13440: checking stack direction for C alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13443 "configure" +echo "configure:13442: checking stack direction for C alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13445 "configure" #include "confdefs.h" find_stack_direction () { @@ -13458,7 +13460,7 @@ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:13462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else @@ -13487,9 +13489,9 @@ fi echo $ac_n "checking for working alloca in function calls""... $ac_c" 1>&6 -echo "configure:13491: checking for working alloca in function calls" >&5 -cat > conftest.$ac_ext <<EOF -#line 13493 "configure" +echo "configure:13493: checking for working alloca in function calls" >&5 +cat > conftest.$ac_ext <<EOF +#line 13495 "configure" #include "confdefs.h" #if defined (__CYGWIN__) @@ -13542,7 +13544,7 @@ } EOF -if { (eval echo configure:13546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then working_alloca_in_function_calls=yes else @@ -13565,10 +13567,10 @@ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:13569: checking for working strcoll" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13572 "configure" +echo "configure:13571: checking for working strcoll" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13574 "configure" #include "confdefs.h" #include <string.h> main () @@ -13578,7 +13580,7 @@ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:13582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -13606,10 +13608,10 @@ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13610: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13613 "configure" +echo "configure:13612: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13615 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -13632,7 +13634,7 @@ ; return 0; } EOF -if { (eval echo configure:13636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13638: \"$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 @@ -13660,10 +13662,10 @@ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:13664: checking whether getpgrp takes no argument" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13667 "configure" +echo "configure:13666: checking whether getpgrp takes no argument" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13669 "configure" #include "confdefs.h" /* @@ -13718,7 +13720,7 @@ } EOF -if { (eval echo configure:13722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -13745,10 +13747,10 @@ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:13749: checking for working mmap" >&5 +echo "configure:13751: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext <<EOF -#line 13752 "configure" +#line 13754 "configure" #include "confdefs.h" #include <stdio.h> #include <unistd.h> @@ -13781,7 +13783,7 @@ return 1; } EOF -if { (eval echo configure:13785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else @@ -13810,9 +13812,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:13814: checking for M_MMAP_THRESHOLD" >&5 +echo "configure:13816: checking for M_MMAP_THRESHOLD" >&5 cat > conftest.$ac_ext <<EOF -#line 13816 "configure" +#line 13818 "configure" #include "confdefs.h" #include <malloc.h> int main() { @@ -13824,7 +13826,7 @@ ; return 0; } EOF -if { (eval echo configure:13828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rel_alloc=no; echo "$ac_t""yes" 1>&6; else @@ -13849,15 +13851,15 @@ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:13853: checking for termios.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13856 "configure" +echo "configure:13855: checking for termios.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13858 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13863: \"$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* @@ -13900,15 +13902,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:13904: checking for termio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13907 "configure" +echo "configure:13906: checking for termio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13909 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13912: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13914: \"$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* @@ -13940,10 +13942,10 @@ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:13944: checking for socket" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13947 "configure" +echo "configure:13946: checking for socket" >&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 socket(); below. */ @@ -13966,7 +13968,7 @@ ; return 0; } EOF -if { (eval echo configure:13970: \"$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_socket=yes" else @@ -13981,15 +13983,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:13985: checking for netinet/in.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13988 "configure" +echo "configure:13987: checking for netinet/in.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13990 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13995: \"$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* @@ -14006,15 +14008,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:14010: checking for arpa/inet.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14013 "configure" +echo "configure:14012: checking for arpa/inet.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14015 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14020: \"$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* @@ -14039,9 +14041,9 @@ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:14043: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:14045: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 14045 "configure" +#line 14047 "configure" #include "confdefs.h" #include <sys/types.h> @@ -14052,7 +14054,7 @@ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:14056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14058: \"$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 @@ -14070,9 +14072,9 @@ fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:14074: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:14076: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext <<EOF -#line 14076 "configure" +#line 14078 "configure" #include "confdefs.h" #include <sys/types.h> @@ -14082,7 +14084,7 @@ static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:14086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14088: \"$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 @@ -14113,10 +14115,10 @@ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:14117: checking for msgget" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14120 "configure" +echo "configure:14119: checking for msgget" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14122 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ @@ -14139,7 +14141,7 @@ ; return 0; } EOF -if { (eval echo configure:14143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14145: \"$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 @@ -14154,15 +14156,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:14158: checking for sys/ipc.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14161 "configure" +echo "configure:14160: checking for sys/ipc.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14163 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14168: \"$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* @@ -14179,15 +14181,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:14183: checking for sys/msg.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14186 "configure" +echo "configure:14185: checking for sys/msg.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14188 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14193: \"$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* @@ -14225,15 +14227,15 @@ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:14229: checking for dirent.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14232 "configure" +echo "configure:14231: checking for dirent.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14234 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14239: \"$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* @@ -14260,15 +14262,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:14264: checking for sys/dir.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14267 "configure" +echo "configure:14266: checking for sys/dir.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14269 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14274: \"$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* @@ -14301,15 +14303,15 @@ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:14305: checking for nlist.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14308 "configure" +echo "configure:14307: checking for nlist.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14310 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14315: \"$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* @@ -14339,22 +14341,22 @@ echo "checking "for sound support"" 1>&6 -echo "configure:14343: checking "for sound support"" >&5 +echo "configure:14345: 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:14350: checking for multimedia/audio_device.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14353 "configure" +echo "configure:14352: checking for multimedia/audio_device.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14355 "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:14358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14360: \"$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* @@ -14410,12 +14412,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:14414: checking for ALopenport in -laudio" >&5 +echo "configure:14416: 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 14419 "configure" +#line 14421 "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 @@ -14426,7 +14428,7 @@ ALopenport() ; return 0; } EOF -if { (eval echo configure:14430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14432: \"$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 @@ -14457,12 +14459,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:14461: checking for AOpenAudio in -lAlib" >&5 +echo "configure:14463: 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 14466 "configure" +#line 14468 "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 @@ -14473,7 +14475,7 @@ AOpenAudio() ; return 0; } EOF -if { (eval echo configure:14477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14479: \"$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 @@ -14521,15 +14523,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:14525: checking for ${dir}/soundcard.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14528 "configure" +echo "configure:14527: checking for ${dir}/soundcard.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14530 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14535: \"$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* @@ -14583,15 +14585,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:14587: checking for audio/audiolib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14590 "configure" +echo "configure:14589: checking for audio/audiolib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14592 "configure" #include "confdefs.h" #include <audio/audiolib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14597: \"$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* @@ -14609,12 +14611,12 @@ echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6 -echo "configure:14613: checking for AuOpenServer in -laudio" >&5 +echo "configure:14615: 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 14618 "configure" +#line 14620 "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 @@ -14625,7 +14627,7 @@ AuOpenServer() ; return 0; } EOF -if { (eval echo configure:14629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14631: \"$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 @@ -14664,7 +14666,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 14668 "configure" +#line 14670 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF @@ -14695,7 +14697,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:14699: checking for $ac_word" >&5 +echo "configure:14701: 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. @@ -14724,10 +14726,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:14728: checking for esd_play_stream" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14731 "configure" +echo "configure:14730: checking for esd_play_stream" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14733 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char esd_play_stream(); below. */ @@ -14750,7 +14752,7 @@ ; return 0; } EOF -if { (eval echo configure:14754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14756: \"$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 @@ -14801,7 +14803,7 @@ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:14805: checking for TTY-related features" >&5 +echo "configure:14807: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -14814,12 +14816,12 @@ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:14818: checking for tgetent in -lncurses" >&5 +echo "configure:14820: 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 14823 "configure" +#line 14825 "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 @@ -14830,7 +14832,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:14834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14836: \"$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 @@ -14863,15 +14865,15 @@ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:14867: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14870 "configure" +echo "configure:14869: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14872 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14877: \"$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* @@ -14893,15 +14895,15 @@ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:14897: checking for ncurses/term.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14900 "configure" +echo "configure:14899: checking for ncurses/term.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14902 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14907: \"$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* @@ -14931,15 +14933,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:14935: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14938 "configure" +echo "configure:14937: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14940 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14945: \"$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* @@ -14974,12 +14976,12 @@ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:14978: checking for tgetent in -l$lib" >&5 +echo "configure:14980: 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 14983 "configure" +#line 14985 "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 @@ -14990,7 +14992,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:14994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14996: \"$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 @@ -15021,12 +15023,12 @@ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:15025: checking for tgetent in -lcurses" >&5 +echo "configure:15027: 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 15030 "configure" +#line 15032 "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 @@ -15037,7 +15039,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:15041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15043: \"$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 @@ -15055,12 +15057,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:15059: checking for tgetent in -ltermcap" >&5 +echo "configure:15061: 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 15064 "configure" +#line 15066 "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 @@ -15071,7 +15073,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:15075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15077: \"$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 @@ -15120,15 +15122,15 @@ if test "$with_gpm" != "no"; then ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gpm.h""... $ac_c" 1>&6 -echo "configure:15124: checking for gpm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 15127 "configure" +echo "configure:15126: checking for gpm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 15129 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15134: \"$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* @@ -15146,12 +15148,12 @@ echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:15150: checking for Gpm_Open in -lgpm" >&5 +echo "configure:15152: 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 15155 "configure" +#line 15157 "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 @@ -15162,7 +15164,7 @@ Gpm_Open() ; return 0; } EOF -if { (eval echo configure:15166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15168: \"$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 @@ -15214,20 +15216,20 @@ test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ != "no no no" && echo "checking for database support" 1>&6 -echo "configure:15218: checking for database support" >&5 +echo "configure:15220: 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:15223: checking for ndbm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 15226 "configure" +echo "configure:15225: checking for ndbm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 15228 "configure" #include "confdefs.h" #include <ndbm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15233: \"$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* @@ -15257,12 +15259,12 @@ if test "$with_database_gdbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:15261: checking for dbm_open in -lgdbm" >&5 +echo "configure:15263: 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 15266 "configure" +#line 15268 "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 @@ -15273,7 +15275,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:15277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15279: \"$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 @@ -15301,10 +15303,10 @@ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:15305: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 15308 "configure" +echo "configure:15307: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 15310 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -15327,7 +15329,7 @@ ; return 0; } EOF -if { (eval echo configure:15331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15333: \"$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 @@ -15346,12 +15348,12 @@ echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:15350: checking for dbm_open in -ldbm" >&5 +echo "configure:15352: 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 15355 "configure" +#line 15357 "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 @@ -15362,7 +15364,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:15366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15368: \"$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 @@ -15403,10 +15405,10 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:15407: checking for Berkeley db.h" >&5 +echo "configure:15409: checking for Berkeley db.h" >&5 for header in "db/db.h" "db.h"; do cat > conftest.$ac_ext <<EOF -#line 15410 "configure" +#line 15412 "configure" #include "confdefs.h" #include <stdlib.h> @@ -15428,7 +15430,7 @@ ; return 0; } EOF -if { (eval echo configure:15432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else @@ -15444,9 +15446,9 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:15448: checking for Berkeley DB version" >&5 +echo "configure:15450: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext <<EOF -#line 15450 "configure" +#line 15452 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 1 @@ -15458,7 +15460,7 @@ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 15462 "configure" +#line 15464 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 2 @@ -15470,7 +15472,7 @@ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 15474 "configure" +#line 15476 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 3 @@ -15504,10 +15506,10 @@ rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:15508: checking for $dbfunc" >&5 - -cat > conftest.$ac_ext <<EOF -#line 15511 "configure" +echo "configure:15510: checking for $dbfunc" >&5 + +cat > conftest.$ac_ext <<EOF +#line 15513 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $dbfunc(); below. */ @@ -15530,7 +15532,7 @@ ; return 0; } EOF -if { (eval echo configure:15534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15536: \"$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 @@ -15549,12 +15551,12 @@ echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:15553: checking for $dbfunc in -ldb" >&5 +echo "configure:15555: 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 15558 "configure" +#line 15560 "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 @@ -15565,7 +15567,7 @@ $dbfunc() ; return 0; } EOF -if { (eval echo configure:15569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15571: \"$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 @@ -15599,12 +15601,12 @@ echo "configure: warning: "db_create is really $dbfunc"" 1>&2 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:15603: checking for $dbfunc in -ldb" >&5 +echo "configure:15605: 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 15608 "configure" +#line 15610 "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 @@ -15615,7 +15617,7 @@ $dbfunc() ; return 0; } EOF -if { (eval echo configure:15619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15621: \"$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 @@ -15674,12 +15676,12 @@ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:15678: checking for SOCKSinit in -lsocks" >&5 +echo "configure:15680: 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 15683 "configure" +#line 15685 "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 @@ -15690,7 +15692,7 @@ SOCKSinit() ; return 0; } EOF -if { (eval echo configure:15694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15696: \"$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 @@ -15746,15 +15748,15 @@ if test "$use_number_lib" = "gmp"; then ac_safe=`echo "gmp.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:15750: checking for gmp.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 15753 "configure" +echo "configure:15752: checking for gmp.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 15755 "configure" #include "confdefs.h" #include <gmp.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15760: \"$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* @@ -15772,12 +15774,12 @@ echo $ac_n "checking for __gmpz_init in -lgmp""... $ac_c" 1>&6 -echo "configure:15776: checking for __gmpz_init in -lgmp" >&5 +echo "configure:15778: checking for __gmpz_init in -lgmp" >&5 ac_lib_var=`echo gmp'_'__gmpz_init | sed 'y%./+-%__p_%'` xe_check_libs=" -lgmp " cat > conftest.$ac_ext <<EOF -#line 15781 "configure" +#line 15783 "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 @@ -15788,7 +15790,7 @@ __gmpz_init() ; return 0; } EOF -if { (eval echo configure:15792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15794: \"$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 @@ -15837,15 +15839,15 @@ for library in "" "-lcrypto"; do ac_safe=`echo "mp.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for mp.h""... $ac_c" 1>&6 -echo "configure:15841: checking for mp.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 15844 "configure" +echo "configure:15843: checking for mp.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 15846 "configure" #include "confdefs.h" #include <mp.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15851: \"$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* @@ -15865,12 +15867,12 @@ xe_msg_checking="for mp_mfree in -lmp" test -n "$library" && xe_msg_checking="$xe_msg_checking using extra libs $library" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:15869: checking "$xe_msg_checking"" >&5 +echo "configure:15871: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo mp'_'mp_mfree | sed 'y%./+-%__p_%'` xe_check_libs=" -lmp $library" cat > conftest.$ac_ext <<EOF -#line 15874 "configure" +#line 15876 "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 @@ -15881,7 +15883,7 @@ mp_mfree() ; return 0; } EOF -if { (eval echo configure:15885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15887: \"$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 @@ -15902,12 +15904,12 @@ xe_msg_checking="for mfree in -lmp" test -n "$library" && xe_msg_checking="$xe_msg_checking using extra libs $library" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:15906: checking "$xe_msg_checking"" >&5 +echo "configure:15908: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo mp'_'mfree | sed 'y%./+-%__p_%'` xe_check_libs=" -lmp $library" cat > conftest.$ac_ext <<EOF -#line 15911 "configure" +#line 15913 "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 @@ -15918,7 +15920,7 @@ mfree() ; return 0; } EOF -if { (eval echo configure:15922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15924: \"$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 @@ -15960,10 +15962,10 @@ LIBS="$LIBS $library" && if test "$extra_verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi fi echo $ac_n "checking for mp_move""... $ac_c" 1>&6 -echo "configure:15964: checking for mp_move" >&5 - -cat > conftest.$ac_ext <<EOF -#line 15967 "configure" +echo "configure:15966: checking for mp_move" >&5 + +cat > conftest.$ac_ext <<EOF +#line 15969 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mp_move(); below. */ @@ -15986,7 +15988,7 @@ ; return 0; } EOF -if { (eval echo configure:15990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_mp_move=yes" else @@ -16017,10 +16019,10 @@ LIBS="$LIBS $library" && if test "$extra_verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi fi echo $ac_n "checking for move""... $ac_c" 1>&6 -echo "configure:16021: checking for move" >&5 - -cat > conftest.$ac_ext <<EOF -#line 16024 "configure" +echo "configure:16023: checking for move" >&5 + +cat > conftest.$ac_ext <<EOF +#line 16026 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char move(); below. */ @@ -16043,7 +16045,7 @@ ; return 0; } EOF -if { (eval echo configure:16047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_move=yes" else @@ -16090,11 +16092,11 @@ fi cat > conftest.$ac_ext <<EOF -#line 16094 "configure" +#line 16096 "configure" #include "confdefs.h" int main(int c,char *v[]){return 0;} EOF -if { (eval echo configure:16098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:16100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else
--- a/configure.in Mon Sep 20 19:11:29 2004 +0000 +++ b/configure.in Mon Sep 20 19:20:08 2004 +0000 @@ -2055,6 +2055,8 @@ cflags_warning="-qinfo" elif test "$GCC" = "yes"; then cflags_warning="-Wall -Wno-switch -Winline -Wmissing-prototypes" + cflags_warning="$cflags_warning -Wunused-parameter -Wunused-variable" + dnl Yuck, bad compares have been worth at least 3 crashes! cflags_warning="$cflags_warning -Wsign-compare" cflags_warning="$cflags_warning -Wundef -Wstrict-prototypes"
--- a/lib-src/ChangeLog Mon Sep 20 19:11:29 2004 +0000 +++ b/lib-src/ChangeLog Mon Sep 20 19:20:08 2004 +0000 @@ -1,3 +1,15 @@ +2004-09-14 Jerry James <james@xemacs.org> + + * digest-doc.c (main): Remove unused argc and argv. + * fakemail.c (main): Ditto. + * make-dump-id.c (main): Ditto. + * profile.c (main): Ditto. + * sorted-doc.c (main): Ditto. + * gnuclient.c (tell_emacs_to_resume): Mark unused parameters. + * gnuserv.c (main): Ditto. + * make-docfile.c (write_c_args): Ditto. + * pop.c (socket_connection): Ditto. + 2004-08-10 Jerry James <james@xemacs.org> * etags.c: Update to author version 16.56.
--- a/lib-src/digest-doc.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lib-src/digest-doc.c Mon Sep 20 19:20:08 2004 +0000 @@ -11,7 +11,7 @@ #include <stdio.h> int -main (int argc, char *argv[]) +main () { register int ch; register int notfirst = 0;
--- a/lib-src/fakemail.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lib-src/fakemail.c Mon Sep 20 19:20:08 2004 +0000 @@ -34,7 +34,7 @@ #include <stdio.h> #include <stdlib.h> int -main (int argc, char *argv[]) +main () { /* Linux /bin/mail, if it exists, is NOT the Unix v7 mail that fakemail depends on! This causes garbled mail. Better to
--- a/lib-src/gnuclient.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lib-src/gnuclient.c Mon Sep 20 19:20:08 2004 +0000 @@ -53,6 +53,7 @@ #endif #include "gnuserv.h" +#include "compiler.h" char gnuserv_version[] = "gnuclient version " GNUSERV_VERSION; @@ -81,7 +82,7 @@ void initialize_signals (void); static void -tell_emacs_to_resume (int sig) +tell_emacs_to_resume (int UNUSED (sig)) { char buffer[GSERV_BUFSZ+1]; int s; /* socket / msqid to server */
--- a/lib-src/gnuserv.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lib-src/gnuserv.c Mon Sep 20 19:20:08 2004 +0000 @@ -59,9 +59,11 @@ #include <string.h> #endif /* HAVE_STRING_H */ +#include "compiler.h" + #if !defined(SYSV_IPC) && !defined(UNIX_DOMAIN_SOCKETS) && \ !defined(INTERNET_DOMAIN_SOCKETS) -main () +int main () { fprintf (stderr,"Sorry, the Emacs server is only supported on systems that have\n"); fprintf (stderr,"Unix Domain sockets, Internet Domain sockets or System V IPC\n"); @@ -855,7 +857,7 @@ int -main (int argc, char *argv[]) +main (int UNUSED (argc), char *argv[]) { int chan; /* temporary channel number */ #ifdef SYSV_IPC
--- a/lib-src/make-docfile.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lib-src/make-docfile.c Mon Sep 20 19:20:08 2004 +0000 @@ -49,6 +49,8 @@ #include <string.h> #include <ctype.h> +#include "compiler.h" + /* XEmacs addition */ #define C_IDENTIFIER_CHAR_P(c) \ (('A' <= c && c <= 'Z') || \ @@ -495,7 +497,8 @@ MINARGS and MAXARGS are the minimum and maximum number of arguments. */ static void -write_c_args (FILE *out, const char *func, char *buf, int minargs, int maxargs) +write_c_args (FILE *out, const char *UNUSED (func), char *buf, + int minargs, int maxargs) { register char *p; int in_ident = 0;
--- a/lib-src/make-dump-id.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lib-src/make-dump-id.c Mon Sep 20 19:20:08 2004 +0000 @@ -54,7 +54,7 @@ } int -main (int argc, char *argv[]) +main () { FILE *f;
--- a/lib-src/pop.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lib-src/pop.c Mon Sep 20 19:20:08 2004 +0000 @@ -44,6 +44,7 @@ #define CLOSESOCKET(s) close(s) #endif #include "pop.h" +#include "compiler.h" #ifdef sun #include <malloc.h> @@ -950,7 +951,13 @@ * into pop_error. */ static int -socket_connection (char *host, int flags) +socket_connection (char *host, +#if defined (KERBEROS) || defined (HESIOD) + int flags +#else + int UNUSED (flags) +#endif + ) { struct hostent *hostent; struct servent *servent;
--- a/lib-src/profile.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lib-src/profile.c Mon Sep 20 19:20:08 2004 +0000 @@ -91,7 +91,7 @@ } int -main (int argc, char *argv[]) +main () { int c; while ((c = getchar ()) != EOF)
--- a/lib-src/sorted-doc.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lib-src/sorted-doc.c Mon Sep 20 19:20:08 2004 +0000 @@ -99,7 +99,7 @@ }; int -main (int argc, char *argv[]) +main () { register DOCSTR *dp = NULL; /* allocated DOCSTR */ register LINE *lp = NULL; /* allocated line */
--- a/lwlib/ChangeLog Mon Sep 20 19:11:29 2004 +0000 +++ b/lwlib/ChangeLog Mon Sep 20 19:20:08 2004 +0000 @@ -1,3 +1,28 @@ +2004-09-14 Jerry James <james@xemacs.org> + + * Makefile.in.in (cppflags): Make compiler.h available. + * config.h.in: Include compiler.h. + * lwlib.c (max): Remove; now defined in compiler.h. + (merge_widget_value): Fix misplaced `change' computation. + * xlwcheckbox.c (DrawCheck): conditionalize declaration and + assignment of variable bw like its use. + * xlwtabs.c (TabsResize): Comment out declaration and assignment + of variable tab, whose use is commented out. + + * lwlib-Xaw.c: + * lwlib-Xlw.c: + * lwlib-Xm.c: + * lwlib-utils.c: + * lwlib.c: + * xlwcheckbox.c: + * xlwgauge.c: + * xlwgcs.c: + * xlwmenu.c: + * xlwradio.c: + * xlwscrollbar.c: + * xlwtabs.c: + Mark unused parameters with the UNUSED macro. + 2004-09-14 Jerry James <james@xemacs.org> * xlwgauge.c (GaugeConvert): Fix type-punning warning.
--- a/lwlib/Makefile.in.in Mon Sep 20 19:11:29 2004 +0000 +++ b/lwlib/Makefile.in.in Mon Sep 20 19:20:08 2004 +0000 @@ -54,7 +54,7 @@ c_switch_all=@c_switch_all@ -cppflags = $(CPPFLAGS) -I. $(c_switch_all) +cppflags = $(CPPFLAGS) -I. -I$(srcdir)/../src $(c_switch_all) cflags = $(CFLAGS) $(cppflags) #ifdef SOLARIS2
--- a/lwlib/config.h.in Mon Sep 20 19:11:29 2004 +0000 +++ b/lwlib/config.h.in Mon Sep 20 19:20:08 2004 +0000 @@ -24,6 +24,7 @@ #define _LWLIB_CONFIG_H_ #include "../src/config.h" +#include "../src/compiler.h" #undef NEED_MOTIF #undef NEED_ATHENA
--- a/lwlib/lwlib-Xaw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lwlib/lwlib-Xaw.c Mon Sep 20 19:20:08 2004 +0000 @@ -122,7 +122,7 @@ void xaw_update_one_widget (widget_instance *instance, Widget widget, - widget_value *val, Boolean deep_p) + widget_value *val, Boolean UNUSED (deep_p)) { if (0) ; @@ -258,7 +258,7 @@ } void -xaw_popup_menu (Widget widget, XEvent *event) +xaw_popup_menu (Widget UNUSED (widget), XEvent *UNUSED (event)) { /* An Athena menubar has not been implemented. */ return; @@ -344,7 +344,7 @@ static Widget make_dialog (const char* name, Widget parent, Boolean pop_up_p, - const char* shell_title, const char* icon_name, + const char* shell_title, const char* UNUSED (icon_name), Boolean text_input_slot, Boolean radio_box, Boolean list, int left_buttons, int right_buttons) @@ -587,7 +587,8 @@ #ifdef LWLIB_DIALOGS_ATHENA static XtActionProc -wm_delete_window (Widget shell, XtPointer closure, XtPointer call_data) +wm_delete_window (Widget shell, XtPointer UNUSED (closure), + XtPointer UNUSED (call_data)) { LWLIB_ID id; Widget *kids = 0;
--- a/lwlib/lwlib-Xlw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lwlib/lwlib-Xlw.c Mon Sep 20 19:20:08 2004 +0000 @@ -266,7 +266,7 @@ } static void -xlw_update_scrollbar (widget_instance *instance, Widget widget, +xlw_update_scrollbar (widget_instance *UNUSED (instance), Widget widget, widget_value *val) { if (val->scrollbar_data) @@ -392,8 +392,8 @@ return tab; } -static void build_tabs_in_widget (widget_instance* instance, Widget widget, - widget_value* val) +static void build_tabs_in_widget (widget_instance* UNUSED (instance), + Widget widget, widget_value* val) { widget_value* cur = val; for (cur = val; cur; cur = cur->next) @@ -533,7 +533,7 @@ void xlw_update_one_widget (widget_instance* instance, Widget widget, - widget_value* val, Boolean deep_p) + widget_value* val, Boolean UNUSED (deep_p)) { WidgetClass class_ = XtClass (widget); @@ -570,14 +570,13 @@ } void -xlw_update_one_value (widget_instance* instance, Widget widget, - widget_value* val) +xlw_update_one_value (widget_instance* UNUSED (instance), + Widget UNUSED (widget), widget_value* UNUSED (val)) { - return; } void -xlw_pop_instance (widget_instance* instance, Boolean up) +xlw_pop_instance (widget_instance* UNUSED (instance), Boolean UNUSED (up)) { }
--- a/lwlib/lwlib-Xm.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lwlib/lwlib-Xm.c Mon Sep 20 19:20:08 2004 +0000 @@ -74,9 +74,9 @@ XtPointer); /* static void xm_pop_down_callback (Widget, XtPointer, XtPointer); */ static void xm_generic_callback (Widget, XtPointer, XtPointer); +#if defined (LWLIB_DIALOGS_MOTIF) || defined (LWLIB_WIDGETS_MOTIF) static void mark_dead_instance_destroyed (Widget widget, XtPointer closure, XtPointer call_data); -#if defined (LWLIB_DIALOGS_MOTIF) || defined (LWLIB_WIDGETS_MOTIF) static void xm_nosel_callback (Widget, XtPointer, XtPointer); #endif #ifdef LWLIB_SCROLLBARS_MOTIF @@ -339,7 +339,7 @@ /* update of buttons */ static void xm_update_pushbutton (widget_instance* instance, Widget widget, - widget_value* val) + widget_value* UNUSED (val)) { Arg al [1]; XtSetArg (al [0], XmNalignment, XmALIGNMENT_CENTER); @@ -828,7 +828,13 @@ void xm_update_one_widget (widget_instance* instance, Widget widget, - widget_value* val, Boolean deep_p) + widget_value* val, +#ifdef LWLIB_MENUBARS_MOTIF + Boolean deep_p +#else + Boolean UNUSED (deep_p) +#endif + ) { WidgetClass class_; Arg al [20]; @@ -1873,7 +1879,13 @@ /* Destruction of instances */ void -xm_destroy_instance (widget_instance* instance) +xm_destroy_instance ( +#if defined (LWLIB_DIALOGS_MOTIF) || defined (LWLIB_WIDGETS_MOTIF) + widget_instance* instance +#else + widget_instance* UNUSED (instance) +#endif + ) { #if defined (LWLIB_DIALOGS_MOTIF) || defined (LWLIB_WIDGETS_MOTIF) /* It appears that this is used only for dialog boxes. */ @@ -2223,7 +2235,7 @@ /* set the keyboard focus */ void -xm_set_keyboard_focus (Widget parent, Widget w) +xm_set_keyboard_focus (Widget UNUSED (parent), Widget w) { XmProcessTraversal (w, XmTRAVERSE_CURRENT); /* At some point we believed that it was necessary to use XtSetKeyboardFocus
--- a/lwlib/lwlib-utils.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lwlib/lwlib-utils.c Mon Sep 20 19:20:08 2004 +0000 @@ -166,7 +166,7 @@ } void -XtSafelyDestroyWidget (Widget widget) +XtSafelyDestroyWidget (Widget UNUSED (widget)) { #if 0
--- a/lwlib/lwlib.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lwlib/lwlib.c Mon Sep 20 19:20:08 2004 +0000 @@ -366,7 +366,8 @@ } static void -mark_widget_destroyed (Widget widget, XtPointer closure, XtPointer call_data) +mark_widget_destroyed (Widget widget, XtPointer closure, + XtPointer UNUSED (call_data)) { widget_instance *instance = (widget_instance*)closure; @@ -512,15 +513,6 @@ return (s1 && s2) ? strcmp (s1, s2) : s1 ? False : !!s2; } -#ifndef WIN32_NATIVE -static change_type -max (change_type i1, change_type i2) -{ - return (int)i1 > (int)i2 ? i1 : i2; -} -#endif - - #if 0 # define EXPLAIN(name, oc, nc, desc, a1, a2) \ printf ("Change: \"%s\"\tmax(%s=%d,%s=%d)\t%s %d %d\n", \ @@ -672,8 +664,8 @@ { EXPLAIN (val1->name, change, merged_next->change, "(following change)", 0, 0); + change = max (change, merged_next->change); } - change = max (change, merged_next->change); } val1->next = merged_next; @@ -1277,7 +1269,7 @@ widget_instance. */ void lw_internal_update_other_instances (Widget widget, XtPointer closure, - XtPointer call_data) + XtPointer UNUSED (call_data)) { /* To forbid recursive calls */ static Boolean updating; @@ -1341,7 +1333,7 @@ /* Show busy */ static void -show_one_widget_busy (Widget w, Boolean flag) +show_one_widget_busy (Widget w, Boolean UNUSED (flag)) { Pixel foreground = 0; Pixel background = 1;
--- a/lwlib/xlwcheckbox.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lwlib/xlwcheckbox.c Mon Sep 20 19:20:08 2004 +0000 @@ -221,10 +221,14 @@ /*ARGSUSED*/ static void -CheckboxInit (Widget request, +CheckboxInit (Widget UNUSED (request), +#if DRAW_CHECK Widget new, - ArgList args, - Cardinal *num_args) +#else + Widget UNUSED (new), +#endif + ArgList UNUSED (args), + Cardinal *UNUSED (num_args)) { #if DRAW_CHECK CheckboxWidget cw = (CheckboxWidget) new; @@ -277,9 +281,14 @@ /* ARGSUSED */ static void -CheckboxDestroy (Widget w, - XtPointer junk, - XtPointer garbage) +CheckboxDestroy ( +#if DRAW_CHECK + Widget w, +#else + Widget UNUSED (w), +#endif + XtPointer UNUSED (junk), + XtPointer UNUSED (garbage)) { #if DRAW_CHECK CheckboxWidget cw = (CheckboxWidget) w; @@ -356,8 +365,9 @@ Dimension s = swid(cw); Dimension bsz = bsize(cw); Position bx,by ; /* Check upper-left */ - Dimension bw,bh ; + Dimension bh ; #ifdef _ThreeDP_h + Dimension bw; GC top, bot; #endif GC ctr ; @@ -365,11 +375,13 @@ /* foreground GC */ gc = XtIsSensitive(w) ? cw->command.normal_GC : cw->label.gray_GC ; - bw = bh = bs(cw) ; + bh = bs(cw) ; bx = cw->label.internal_width ; by = cw->core.height/2 - bh/2 ; #ifdef _ThreeDP_h + bw = bh ; + if( !cw->command.set ) { top = cw->threeD.top_shadow_GC ; bot = cw->threeD.bot_shadow_GC ;
--- a/lwlib/xlwgauge.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lwlib/xlwgauge.c Mon Sep 20 19:20:08 2004 +0000 @@ -241,8 +241,8 @@ static void GaugeInit (Widget request, Widget new, - ArgList args, - Cardinal *num_args) + ArgList UNUSED (args), + Cardinal *UNUSED (num_args)) { GaugeWidget gw = (GaugeWidget) new; @@ -366,8 +366,8 @@ /* ARGSUSED */ static void GaugeExpose (Widget w, - XEvent *event, - Region region) + XEvent *UNUSED (event), + Region UNUSED (region)) { GaugeWidget gw = (GaugeWidget) w; register Display *dpy = XtDisplay(w) ; @@ -376,7 +376,6 @@ GC gctop, gcbot ; /* dark, light shadows */ int len ; /* length (width or height) of widget */ - int hgt ; /* height (width) of widget */ int e0,e1 ; /* ends of the gauge */ int x ; int y ; /* vertical (horizontal) position */ @@ -397,10 +396,8 @@ if( gw->gauge.orientation == XtorientHorizontal ) { len = gw->core.width ; - hgt = gw->core.height ; } else { len = gw->core.height ; - hgt = gw->core.width ; } /* if the gauge is selected, signify by drawing the background @@ -503,10 +500,10 @@ static Boolean GaugeSetValues (Widget old, - Widget request, + Widget UNUSED (request), Widget new, - ArgList args, - Cardinal *num_args) + ArgList UNUSED (args), + Cardinal *UNUSED (num_args)) { GaugeWidget oldgw = (GaugeWidget) old; GaugeWidget gw = (GaugeWidget) new; @@ -724,7 +721,7 @@ static void GaugeLoseSel (Widget w, - Atom *selection) /* usually XA_PRIMARY */ + Atom *UNUSED (selection)) /* usually XA_PRIMARY */ { GaugeWidget gw = (GaugeWidget)w ; Display *dpy = XtDisplay(w) ; @@ -742,9 +739,9 @@ static void -GaugeDoneSel (Widget w, - Atom *selection, /* usually XA_PRIMARY */ - Atom *target) /* requested target */ +GaugeDoneSel (Widget UNUSED (w), + Atom *UNUSED (selection), /* usually XA_PRIMARY */ + Atom *UNUSED (target)) /* requested target */ { /* selection done, anything to do? */ } @@ -775,8 +772,8 @@ Atom *selection, Atom *type, XtPointer value, - unsigned long *length, - int *format) + unsigned long *UNUSED (length), + int *UNUSED (format)) { Display *dpy = XtDisplay(w) ; Atom target = (Atom)client ; @@ -1108,7 +1105,7 @@ static void GaugeGetValue (XtPointer clientData, - XtIntervalId *intervalId) + XtIntervalId *UNUSED (intervalId)) { GaugeWidget gw = (GaugeWidget)clientData ; Cardinal value ;
--- a/lwlib/xlwgcs.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lwlib/xlwgcs.c Mon Sep 20 19:20:08 2004 +0000 @@ -231,7 +231,13 @@ GC AllocShadeGC(Widget w, Pixel fg, Pixel bg, Font font, - int contrast, Bool be_nice_to_cmap) + int contrast, +#ifdef HAVE_XMU + Bool be_nice_to_cmap +#else + Bool UNUSED (be_nice_to_cmap) +#endif + ) { XGCValues values ; unsigned long vmask, dcmask ; @@ -318,7 +324,13 @@ /* return arm-shadow gc. */ GC -AllocArmGC(Widget w, int contrast, Bool be_nice_to_cmap) +AllocArmGC(Widget w, int contrast, +#ifdef HAVE_XMU + Bool be_nice_to_cmap +#else + Bool UNUSED (be_nice_to_cmap) +#endif + ) { Screen *scr = XtScreen (w); XGCValues values ; @@ -514,8 +526,9 @@ #if XtSpecificationRelease < 5 static GC -XtAllocateGC(Widget w, int depth, unsigned long mask, XGCValues *values, - unsigned long dynamic, unsigned long dontcare) +XtAllocateGC(Widget w, int UNUSED (depth), unsigned long mask, + XGCValues *values, unsigned long UNUSED (dynamic), + unsigned long UNUSED (dontcare)) { return XtGetGC(w, mask, values) ; }
--- a/lwlib/xlwmenu.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lwlib/xlwmenu.c Mon Sep 20 19:20:08 2004 +0000 @@ -1339,7 +1339,7 @@ Window window, int x, int y, unsigned int width, - Boolean vertical, + Boolean UNUSED (vertical), shadow_type type) { Display *dpy = XtDisplay (mw); @@ -1531,7 +1531,7 @@ static void label_button_size (XlwMenuWidget mw, widget_value *val, - Boolean in_menubar, + Boolean UNUSED (in_menubar), unsigned int *toggle_width, unsigned int *label_width, unsigned int *bindings_width, @@ -1554,10 +1554,10 @@ Boolean highlighted, Window window, int x, int y, - unsigned int width, - unsigned int height, + unsigned int UNUSED (width), + unsigned int UNUSED (height), unsigned int label_offset, - unsigned int binding_tab) + unsigned int UNUSED (binding_tab)) { int y_offset = mw->menu.shadow_thickness + mw->menu.vertical_margin; GC gc; @@ -1949,7 +1949,7 @@ static void separator_size (XlwMenuWidget mw, widget_value *val, - Boolean in_menubar, + Boolean UNUSED (in_menubar), unsigned int *toggle_width, unsigned int *label_width, unsigned int *rest_width, @@ -1964,13 +1964,13 @@ separator_draw (XlwMenuWidget mw, widget_value *val, Boolean in_menubar, - Boolean highlighted, + Boolean UNUSED (highlighted), Window window, int x, int y, unsigned int width, unsigned int height, - unsigned int label_tab, - unsigned int binding_tab) + unsigned int UNUSED (label_tab), + unsigned int UNUSED (binding_tab)) { unsigned int sep_width; @@ -1989,9 +1989,9 @@ } static void -pushright_size (XlwMenuWidget mw, - widget_value *val, - Boolean in_menubar, +pushright_size (XlwMenuWidget UNUSED (mw), + widget_value *UNUSED (val), + Boolean UNUSED (in_menubar), unsigned int *toggle_width, unsigned int *label_width, unsigned int *rest_width, @@ -3000,8 +3000,8 @@ #endif /* NEED_MOTIF */ static void -XlwMenuInitialize (Widget request, Widget new_, ArgList args, - Cardinal *num_args) +XlwMenuInitialize (Widget UNUSED (request), Widget new_, ArgList UNUSED (args), + Cardinal *UNUSED (num_args)) { /* Get the GCs and the widget size */ XlwMenuWidget mw = (XlwMenuWidget)new_; @@ -3104,7 +3104,7 @@ receives expose events through Xt. So we repaint all the other panes when receiving an Expose event. */ static void -XlwMenuRedisplay (Widget w, XEvent *ev, Region region) +XlwMenuRedisplay (Widget w, XEvent *UNUSED (ev), Region UNUSED (region)) { XlwMenuWidget mw = (XlwMenuWidget)w; int i; @@ -3163,8 +3163,8 @@ } static Boolean -XlwMenuSetValues (Widget current, Widget request, Widget new_, ArgList args, - Cardinal *num_args) +XlwMenuSetValues (Widget current, Widget UNUSED (request), Widget new_, + ArgList UNUSED (args), Cardinal *UNUSED (num_args)) { XlwMenuWidget oldmw = (XlwMenuWidget)current; XlwMenuWidget newmw = (XlwMenuWidget)new_; @@ -3304,7 +3304,8 @@ Time x_focus_timestamp_really_sucks_fix_me_better; static void -Start (Widget w, XEvent *ev, String *params, Cardinal *num_params) +Start (Widget w, XEvent *ev, String *UNUSED (params), + Cardinal *UNUSED (num_params)) { XlwMenuWidget mw = (XlwMenuWidget)w; @@ -3339,14 +3340,16 @@ } static void -Drag (Widget w, XEvent *ev, String *params, Cardinal *num_params) +Drag (Widget w, XEvent *ev, String *UNUSED (params), + Cardinal *UNUSED (num_params)) { XlwMenuWidget mw = (XlwMenuWidget)w; handle_motion_event (mw, &ev->xmotion, False); } static void -Select (Widget w, XEvent *ev, String *params, Cardinal *num_params) +Select (Widget w, XEvent *ev, String *UNUSED (params), + Cardinal *UNUSED (num_params)) { XlwMenuWidget mw = (XlwMenuWidget)w; widget_value *selected_item = mw->menu.old_stack [mw->menu.old_depth - 1]; @@ -3467,7 +3470,7 @@ /* display the stupid menu already */ void -xlw_display_menu (Time t) +xlw_display_menu (Time UNUSED (t)) { XlwMenuWidget mw = (XlwMenuWidget)lw_menubar_widget;
--- a/lwlib/xlwradio.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lwlib/xlwradio.c Mon Sep 20 19:20:08 2004 +0000 @@ -219,8 +219,8 @@ static void RadioInit (Widget request, Widget new, - ArgList args, - Cardinal *num_args) + ArgList UNUSED (args), + Cardinal *UNUSED (num_args)) { RadioWidget rw = (RadioWidget) new; RadioWidget rw_req = (RadioWidget) request; @@ -247,9 +247,9 @@ /* ARGSUSED */ static void -RadioDestroy (Widget w, - XtPointer junk, - XtPointer garbage) +RadioDestroy (Widget UNUSED (w), + XtPointer UNUSED (junk), + XtPointer UNUSED (garbage)) { /* TODO: get rid of this */ } @@ -344,10 +344,10 @@ /* ARGSUSED */ static Boolean RadioSetValues (Widget current, - Widget request, + Widget UNUSED (request), Widget new, - ArgList args, - Cardinal *num_args) + ArgList UNUSED (args), + Cardinal *UNUSED (num_args)) { RadioWidget oldrw = (RadioWidget) current; RadioWidget newrw = (RadioWidget) new; @@ -445,9 +445,9 @@ static void RadioHighlight (Widget w, - XEvent *event, - String *params, - Cardinal *num_params) + XEvent *UNUSED (event), + String *UNUSED (params), + Cardinal *UNUSED (num_params)) { RadioWidget rw = (RadioWidget)w; DrawHighlight(w, rw->command.normal_GC) ; @@ -456,9 +456,9 @@ static void RadioUnhighlight (Widget w, - XEvent *event, - String *params, - Cardinal *num_params) + XEvent *UNUSED (event), + String *UNUSED (params), + Cardinal *UNUSED (num_params)) { RadioWidget rw = (RadioWidget)w; DrawHighlight(w, rw->command.inverse_GC) ; @@ -468,9 +468,9 @@ /* ARGSUSED */ void RadioSet (Widget w, - XEvent *event, - String *params, /* unused */ - Cardinal *num_params) /* unused */ + XEvent *UNUSED (event), + String *UNUSED (params), + Cardinal *UNUSED (num_params)) { RadioWidget rw = (RadioWidget)w; RadioWidgetClass class_ = (RadioWidgetClass) w->core.widget_class ; @@ -487,9 +487,9 @@ /* ARGSUSED */ void RadioUnset (Widget w, - XEvent *event, - String *params, /* unused */ - Cardinal *num_params) /* unused */ + XEvent *UNUSED (event), + String *UNUSED (params), + Cardinal *UNUSED (num_params)) { RadioWidget rw = (RadioWidget)w; RadioWidgetClass class_ = (RadioWidgetClass) w->core.widget_class ;
--- a/lwlib/xlwscrollbar.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lwlib/xlwscrollbar.c Mon Sep 20 19:20:08 2004 +0000 @@ -1286,7 +1286,8 @@ /*-------------------------- Method Functions ---------------------------*/ static void -Initialize (Widget treq, Widget tnew, ArgList args, Cardinal *num_args) +Initialize (Widget treq, Widget tnew, ArgList UNUSED (args), + Cardinal *UNUSED (num_args)) { XlwScrollBarWidget request = (XlwScrollBarWidget) treq; XlwScrollBarWidget w = (XlwScrollBarWidget) tnew; @@ -1398,7 +1399,7 @@ } static void -Redisplay (Widget widget, XEvent *event, Region region) +Redisplay (Widget widget, XEvent *UNUSED (event), Region region) { XlwScrollBarWidget w = (XlwScrollBarWidget) widget; @@ -1415,8 +1416,8 @@ } static Boolean -SetValues (Widget current, Widget request, Widget neww, - ArgList args, Cardinal *num_args) +SetValues (Widget current, Widget UNUSED (request), Widget neww, + ArgList UNUSED (args), Cardinal *UNUSED (num_args)) { XlwScrollBarWidget cur = (XlwScrollBarWidget) current; XlwScrollBarWidget w = (XlwScrollBarWidget) neww; @@ -1534,7 +1535,7 @@ /*-------------------------- Action Functions ---------------------------*/ static void -timer (XtPointer data, XtIntervalId *id) +timer (XtPointer data, XtIntervalId *UNUSED (id)) { XlwScrollBarWidget w = (XlwScrollBarWidget) data; w->sb.timerActive = False; @@ -1623,7 +1624,8 @@ } static void -Select (Widget widget, XEvent *event, String *parms, Cardinal *num_parms) +Select (Widget widget, XEvent *event, String *UNUSED (parms), + Cardinal *UNUSED (num_parms)) { XlwScrollBarWidget w = (XlwScrollBarWidget) widget; button_where sb_button; @@ -1757,7 +1759,8 @@ } static void -Drag (Widget widget, XEvent *event, String *parms, Cardinal *num_parms) +Drag (Widget widget, XEvent *event, String *UNUSED (parms), + Cardinal *UNUSED (num_parms)) { XlwScrollBarWidget w = (XlwScrollBarWidget) widget; @@ -1797,7 +1800,8 @@ } static void -Release (Widget widget, XEvent *event, String *parms, Cardinal *num_parms) +Release (Widget widget, XEvent *event, String *UNUSED (parms), + Cardinal *UNUSED (num_parms)) { XlwScrollBarWidget w = (XlwScrollBarWidget) widget; @@ -1824,7 +1828,8 @@ } static void -Jump (Widget widget, XEvent *event, String *parms, Cardinal *num_parms) +Jump (Widget widget, XEvent *event, String *UNUSED (parms), + Cardinal *UNUSED (num_parms)) { XlwScrollBarWidget w = (XlwScrollBarWidget) widget; int last_value; @@ -1883,7 +1888,8 @@ } static void -Abort (Widget widget, XEvent *event, String *parms, Cardinal *num_parms) +Abort (Widget widget, XEvent *event, String *UNUSED (parms), + Cardinal *UNUSED (num_parms)) { XlwScrollBarWidget w = (XlwScrollBarWidget) widget;
--- a/lwlib/xlwtabs.c Mon Sep 20 19:11:29 2004 +0000 +++ b/lwlib/xlwtabs.c Mon Sep 20 19:20:08 2004 +0000 @@ -421,7 +421,8 @@ /* ARGSUSED */ static void -TabsInit(Widget request, Widget new, ArgList args, Cardinal *num_args) +TabsInit(Widget request, Widget new, ArgList UNUSED (args), + Cardinal *UNUSED (num_args)) { TabsWidget newTw = (TabsWidget)new; @@ -477,8 +478,8 @@ */ /* ARGSUSED */ static void -TabsConstraintInitialize(Widget request, Widget new, - ArgList args, Cardinal *num_args) +TabsConstraintInitialize(Widget UNUSED (request), Widget new, + ArgList UNUSED (args), Cardinal *UNUSED (num_args)) { TabsConstraints tab = (TabsConstraints) new->core.constraints ; tab->tabs.greyAlloc = False ; /* defer allocation of pixel */ @@ -527,7 +528,7 @@ int i ; int num_children = tw->composite.num_children ; Widget *childP ; - TabsConstraints tab ; /* #### unused */ + /* TabsConstraints tab ; */ /* #### unused */ Dimension cw,ch,bw ; /* Our size has now been dictated by the parent. Lay out the @@ -566,7 +567,7 @@ ++i, ++childP) if( XtIsManaged(*childP) ) { - tab = (TabsConstraints) (*childP)->core.constraints ; + /* tab = (TabsConstraints) (*childP)->core.constraints ; */ bw = (*childP)->core.border_width ; /* Don't do anything if we can't see any of the child. */ if (ch >= bw*2 && ch > 0 && cw >= bw*2 && cw > 0) @@ -589,7 +590,7 @@ /* ARGSUSED */ static void -TabsExpose(Widget w, XEvent *event, Region region) +TabsExpose(Widget w, XEvent *UNUSED (event), Region UNUSED (region)) { TabsWidget tw = (TabsWidget) w; @@ -604,8 +605,8 @@ /* ARGSUSED */ static Boolean -TabsSetValues(Widget current, Widget request, Widget new, - ArgList args, Cardinal *num_args) +TabsSetValues(Widget current, Widget UNUSED (request), Widget new, + ArgList UNUSED (args), Cardinal *UNUSED (num_args)) { TabsWidget curtw = (TabsWidget) current ; TabsWidget tw = (TabsWidget) new ; @@ -684,8 +685,8 @@ /* ARGSUSED */ static Boolean -TabsConstraintSetValues(Widget current, Widget request, Widget new, - ArgList args, Cardinal *num_args) +TabsConstraintSetValues(Widget current, Widget UNUSED (request), Widget new, + ArgList UNUSED (args), Cardinal *UNUSED (num_args)) { TabsWidget tw = (TabsWidget) XtParent(new) ; TabsConstraints ctab = (TabsConstraints) current->core.constraints ; @@ -737,7 +738,7 @@ static Boolean -TabsAcceptFocus(Widget w, Time *t) +TabsAcceptFocus(Widget w, Time *UNUSED (t)) { if( !w->core.being_destroyed && XtIsRealized(w) && XtIsSensitive(w) && XtIsManaged(w) && w->core.visible ) @@ -1038,7 +1039,8 @@ /* ARGSUSED */ static void -TabsSelect(Widget w, XEvent *event, String *params, Cardinal *num_params) +TabsSelect(Widget w, XEvent *event, String *UNUSED (params), + Cardinal *UNUSED (num_params)) { TabsWidget tw = (TabsWidget) w ; Widget *childP ; @@ -1086,7 +1088,8 @@ /* User hits a key */ static void -TabsPage(Widget w, XEvent *event, String *params, Cardinal *num_params) +TabsPage(Widget w, XEvent *UNUSED (event), String *params, + Cardinal *num_params) { TabsWidget tw = (TabsWidget) w ; Widget newtop = NULL; @@ -1150,7 +1153,8 @@ /* User hits up/down key */ static void -TabsHighlight(Widget w, XEvent *event, String *params, Cardinal *num_params) +TabsHighlight(Widget w, XEvent *UNUSED (event), String *params, + Cardinal *num_params) { TabsWidget tw = (TabsWidget) w ; Widget newhl = NULL; @@ -1215,7 +1219,8 @@ static void -TabsUnhighlight(Widget w, XEvent *event, String *params, Cardinal *num_params) +TabsUnhighlight(Widget w, XEvent *UNUSED (event), String *UNUSED (params), + Cardinal *UNUSED (num_params)) { TabsWidget tw = (TabsWidget) w ; int nc = tw->composite.num_children ;
--- a/modules/ChangeLog Mon Sep 20 19:11:29 2004 +0000 +++ b/modules/ChangeLog Mon Sep 20 19:20:08 2004 +0000 @@ -1,3 +1,9 @@ +2004-09-14 Jerry James <james@xemacs.org> + + * postgresql/postgresql.c: + * ldap/eldap.c: + Mark unused parameters with the UNUSED macro. + 2004-09-14 Jerry James <james@xemacs.org> * ldap/eldap.c (Fldap_open): Change ldap_passwd to ldap_password
--- a/modules/ldap/eldap.c Mon Sep 20 19:11:29 2004 +0000 +++ b/modules/ldap/eldap.c Mon Sep 20 19:20:08 2004 +0000 @@ -71,7 +71,13 @@ static DECLARE_DOESNT_RETURN (signal_ldap_error (LDAP *, LDAPMessage *, int)); static DOESNT_RETURN -signal_ldap_error (LDAP *ld, LDAPMessage *res, int ldap_err) +signal_ldap_error (LDAP *ld, +#if defined HAVE_LDAP_PARSE_RESULT || defined HAVE_LDAP_RESULT2ERROR + LDAPMessage *res, +#else + LDAPMessage *UNUSED (res), +#endif + int ldap_err) { if (ldap_err <= 0) { @@ -117,7 +123,7 @@ } static void -print_ldap (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_ldap (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag)) { Lisp_LDAP *ldap = XLDAP (obj);
--- a/modules/postgresql/postgresql.c Mon Sep 20 19:11:29 2004 +0000 +++ b/modules/postgresql/postgresql.c Mon Sep 20 19:20:08 2004 +0000 @@ -187,16 +187,18 @@ static Lisp_Object #ifdef RUNNING_XEMACS_21_1 -mark_pgconn (Lisp_Object obj, void (*markobj) (Lisp_Object)) +mark_pgconn (Lisp_Object UNUSED (obj), + void (*UNUSED_ARG (markobj)) (Lisp_Object) ATTRIBUTE_UNUSED) #else -mark_pgconn (Lisp_Object obj) +mark_pgconn (Lisp_Object UNUSED (obj)) #endif { return Qnil; } static void -print_pgconn (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_pgconn (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { char buf[256]; PGconn *P; @@ -295,9 +297,10 @@ static Lisp_Object #ifdef RUNNING_XEMACS_21_1 -mark_pgresult (Lisp_Object obj, void (*markobj) (Lisp_Object)) +mark_pgresult (Lisp_Object UNUSED (obj), + void (*UNUSED_ARG (markobj)) (Lisp_Object) ATTRIBUTE_UNUSED) #else -mark_pgresult (Lisp_Object obj) +mark_pgresult (Lisp_Object UNUSED (obj)) #endif { return Qnil; @@ -307,7 +310,8 @@ #define RESULT_CMD_TUPLES_FMT "#<PGresult %s[%s] - %s>" #define RESULT_DEFAULT_FMT "#<PGresult %s - %s>" static void -print_pgresult (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_pgresult (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { char buf[1024]; PGresult *res; @@ -403,7 +407,7 @@ /* notices */ static void -xemacs_notice_processor (void *arg, const char *msg) +xemacs_notice_processor (void *UNUSED (arg), const char *msg) { warn_when_safe (Qpostgresql, Qnotice, "%s", msg); }
--- a/src/ChangeLog Mon Sep 20 19:11:29 2004 +0000 +++ b/src/ChangeLog Mon Sep 20 19:20:08 2004 +0000 @@ -1,3 +1,198 @@ +2004-09-14 Jerry James <james@xemacs.org> + + * compiler.h: Change old UNUSED_ARG into UNUSED_ARG and + ATTRIBUTE_UNUSED. Create a new UNUSED macro that works in the + common case. Define conservatively for the Intel compiler. + * dialog-x.c (dbox_descriptor_to_widget_value): Comment out + declaration and assignment of unused variable title. + (x_make_dialog_box_internal): Remove unused variable parent. + * emacs.c (Fkill_emacs): Uno doesn't grok typeof. + * file-coding.c (Fdefine_coding_system_alias): Remove unused + variable real_coding_system. + * glyphs.c (map_subwindow): Remove unused variable f. + * gui-x.c (button_item_to_widget_value): Rename intlen to + unused_intlen to quiet Uno. + * miscplay.c (UNUSED): Removed in favor of compiler.h version. + * mule-canna.c (Fcanna_touroku_string): Remove unused variable + len. + * mule-canna.c (Fcanna_henkan_next): Remove unused variable endp. + * mule-ccl.c (CCL_WRITE_STRING): Remove unused variable bytes and + fix some indentation problems. + * number-gmp.h: Turn off gcc extensions for Uno. + * redisplay-output.c (compare_display_blocks): #if 0 out + declaration and assignment of unused variable block_end. + * redisplay.c (regenerate_window_extents_only_changed): Remove + unused variable new_start. + (regenerate_window_incrementally): Ditto. + * scrollbar.c (update_scrollbar_instance): #if 0 out declaration + and assignment of unused variable new_window. + * specifier.c (specifier_instance): Remove unused variable tag. + * sysdep.c (tty_init_sys_modes_on_device): Define and assigne + variable output_fd only when it will be used. + (tty_reset_sys_modes_on_device): Ditto. + * sysproc.h: Define the FD_* macros conservatively for Uno. + * syssignal.h (SIG_ARG_MAYBE_UNUSED): New macro. + * syswait.h: Define the W* macros conservatively for Uno. + + * EmacsFrame.c: + * EmacsManager.c: + * ExternalClient.c: + * ExternalShell.c: + * alloc.c: + * balloon_help.c: + * bytecode.c: + * callint.c: + * casetab.c: + * chartab.c: + * cm.c: + * cmdloop.c: + * console-gtk.c: + * console-msw.c: + * console-stream.c: + * console-tty.c: + * console-x.c: + * console.c: + * data.c: + * database.c: + * device-gtk.c: + * device-msw.c: + * device-tty.c: + * device-x.c: + * device.c: + * dialog-gtk.c: + * dialog-msw.c: + * dired.c: + * dumper.c: + * editfns.c: + * elhash.c: + * emacs.c: + * esd.c: + * eval.c: + * event-Xt.c: + * event-gtk.c: + * event-msw.c: + * event-stream.c: + * event-tty.c: + * events.c: + * extents.c: + * faces.c: + * file-coding.c: + * fileio.c: + * filemode.c: + * floatfns.c: + * fns.c: + * frame-gtk.c: + * frame-msw.c: + * frame-tty.c: + * frame-x.c: + * frame.c: + * free-hook.c: + * glyphs-eimage.c: + * glyphs-gtk.c: + * glyphs-msw.c: + * glyphs-shared.c: + * glyphs-widget.c: + * glyphs-x.c: + * glyphs.c: + * gpmevent.c: + * gtk-xemacs.c: + * gui-msw.c: + * gui-x.c: + * gui.c: + * gutter.c: + * hpplay.c: + * input-method-motif.c: + * input-method-xlib.c: + * intl-win32.c: + * intl-x.c: + * keymap.c: + * lread.c: + * lstream.c: + * marker.c: + * menubar-gtk.c: + * menubar-msw.c: + * menubar-x.c: + * menubar.c: + * minibuf.c: + * miscplay.c: + * mule-charset.c: + * mule-coding.c: + * nas.c: + * native-gtk-toolbar.c: + * nt.c: + * ntplay.c: + * number-gmp.c: + * number.c: + * objects-gtk.c: + * objects-msw.c: + * objects-tty.c: + * objects-x.c: + * objects.c: + * opaque.c: + * print.c: + * process-nt.c: + * process-unix.c: + * profile.c: + * rangetab.c: + * redisplay-gtk.c: + * redisplay-msw.c: + * redisplay-output.c: + * redisplay-tty.c: + * redisplay-x.c: + * redisplay.c: + * regex.c: + * scrollbar-gtk.c: + * scrollbar-msw.c: + * scrollbar-x.c: + * scrollbar.c: + * search.c: + * select-gtk.c: + * select-msw.c: + * select-x.c: + * sgiplay.c: + * signal.c: + * sound.c: + * specifier.c: + * sunpro.c: + * symbols.c: + * syntax.c: + * sysdep.c: + * terminfo.c: + * tests.c: + * text.c: + * text.h: + * toolbar-gtk.c: + * toolbar-msw.c: + * toolbar-x.c: + * toolbar.c: + * tooltalk.c: + * ui-byhand.c: + * ui-gtk.c: + * unexaix.c: + * unexalpha.c: + * unexconvex.c: + * unexcw.c: + * unexec.c: + * unexelf.c: + * unexelfsgi.c: + * unexencap.c: + * unexenix.c: + * unexfreebsd.c: + * unexfx2800.c: + * unexhp9k3.c: + * unexhp9k800.c: + * unexmips.c: + * unexnt.c: + * unexsni.c: + * unexsol2-6.c: + * unexsol2.c: + * unexsunos4.c: + * unicode.c: + * vm-limit.c: + * win32.c: + * window.c: + Mark unused parameters with the UNUSED macro. + 2004-09-19 Jerry James <james@xemacs.org> * s/windowsnt.h (DECLARE_DOESNT_RETURN_TYPE): Remove extern so
--- a/src/EmacsFrame.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/EmacsFrame.c Mon Sep 20 19:20:08 2004 +0000 @@ -266,8 +266,8 @@ } static void -EmacsFrameInitialize (Widget request, Widget new, - ArgList dum1, Cardinal *dum2) +EmacsFrameInitialize (Widget UNUSED (request), Widget new, + ArgList UNUSED (unused1), Cardinal *UNUSED (unused2)) { EmacsFrame ew = (EmacsFrame)new; struct frame *f = ew->emacs_frame.frame; @@ -376,8 +376,8 @@ } static Boolean -EmacsFrameSetValues (Widget cur_widget, Widget req_widget, Widget new_widget, - ArgList argv, Cardinal *argc) +EmacsFrameSetValues (Widget cur_widget, Widget UNUSED (req_widget), + Widget new_widget, ArgList argv, Cardinal *argc) { EmacsFrame cur = (EmacsFrame) cur_widget; EmacsFrame new = (EmacsFrame) new_widget; @@ -558,10 +558,10 @@ /* ARGSUSED */ static void -Xt_StringToScrollBarPlacement (XrmValuePtr args, /* unused */ - Cardinal *num_args, /* unused */ - XrmValuePtr fromVal, - XrmValuePtr toVal) +Xt_StringToScrollBarPlacement (XrmValuePtr UNUSED (args), + Cardinal *UNUSED (num_args), + XrmValuePtr fromVal, + XrmValuePtr toVal) { XrmQuark q; char *lowerName = (char *) ALLOCA (strlen ((char *) fromVal->addr) + 1);
--- a/src/EmacsManager.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/EmacsManager.c Mon Sep 20 19:20:08 2004 +0000 @@ -31,6 +31,7 @@ #include "xmotif.h" #include <Xm/RowColumn.h> #endif /* LWLIB_MENUBARS_MOTIF */ +#include "compiler.h" /* For I, Emacs, am a kind god. Unlike the goddess Athena and the Titan Motif, I require no ritual sacrifices to placate the lesser @@ -178,7 +179,8 @@ } static XtGeometryResult -GeometryManager (Widget w, XtWidgetGeometry *request, XtWidgetGeometry *reply) +GeometryManager (Widget w, XtWidgetGeometry *request, + XtWidgetGeometry *UNUSED (reply)) { /* Sure, any changes are fine. */
--- a/src/ExternalClient.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/ExternalClient.c Mon Sep 20 19:20:08 2004 +0000 @@ -173,8 +173,8 @@ WidgetClass externalClientWidgetClass = (WidgetClass) &externalClientClassRec; static void -externalClientInitialize (Widget req, Widget new, ArgList args, - Cardinal *num_args) +externalClientInitialize (Widget UNUSED (req), Widget new, + ArgList UNUSED (args), Cardinal *UNUSED (num_args)) { ExternalClientWidget ecw = (ExternalClientWidget) new; static int error_handler_added = 0; @@ -217,7 +217,7 @@ #ifdef TOOLTALK static Tt_callback_action -tt_callback(Tt_message m, Tt_pattern p) +tt_callback(Tt_message m, Tt_pattern UNUSED (p)) { ExternalClientWidget ecw = (ExternalClientWidget)tt_message_user (m, 0); @@ -400,9 +400,8 @@ } static void -MaskableEventHandler (Widget wid, XtPointer closure, XEvent *event, - Boolean *continue_to_dispatch) - /* closure and continue_to_dispatch unused */ +MaskableEventHandler (Widget wid, XtPointer UNUSED (closure), XEvent *event, + Boolean *UNUSED (continue_to_dispatch)) { ExternalClientWidget w = (ExternalClientWidget) wid; @@ -432,9 +431,8 @@ } static void -EventHandler (Widget wid, XtPointer closure, XEvent *event, - Boolean *continue_to_dispatch) - /* closure and continue_to_dispatch unused */ +EventHandler (Widget wid, XtPointer UNUSED (closure), XEvent *event, + Boolean *UNUSED (continue_to_dispatch)) { ExternalClientWidget w = (ExternalClientWidget) wid; @@ -554,8 +552,15 @@ } } -static void ExternalClientFocusIn (Widget w, XEvent *event, String *params, - Cardinal *num_params) +#ifdef EXTW_USES_MOTIF +# define USED_IF_MOTIF(decl) decl +#else +# define USED_IF_MOTIF(decl) UNUSED (decl) +#endif + +static void ExternalClientFocusIn (Widget w, XEvent *event, + String *USED_IF_MOTIF (params), + Cardinal *USED_IF_MOTIF (num_params)) { ExternalClientWidget ecw = (ExternalClientWidget) w; @@ -568,8 +573,9 @@ #endif } -static void ExternalClientFocusOut (Widget w, XEvent *event, String *params, - Cardinal *num_params) +static void ExternalClientFocusOut (Widget w, XEvent *event, + String *USED_IF_MOTIF (params), + Cardinal *USED_IF_MOTIF (num_params)) { ExternalClientWidget ecw = (ExternalClientWidget) w; @@ -582,8 +588,9 @@ #endif } -static void ExternalClientEnter (Widget w, XEvent *event, String *params, - Cardinal *num_params) +static void ExternalClientEnter (Widget w, XEvent *event, + String *USED_IF_MOTIF (params), + Cardinal *USED_IF_MOTIF (num_params)) { ExternalClientWidget ecw = (ExternalClientWidget) w; @@ -601,8 +608,9 @@ #endif } -static void ExternalClientLeave (Widget w, XEvent *event, String *params, - Cardinal *num_params) +static void ExternalClientLeave (Widget w, XEvent *event, + String *USED_IF_MOTIF (params), + Cardinal *USED_IF_MOTIF (num_params)) { ExternalClientWidget ecw = (ExternalClientWidget) w;
--- a/src/ExternalShell.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/ExternalShell.c Mon Sep 20 19:20:08 2004 +0000 @@ -251,8 +251,8 @@ WidgetClass externalShellWidgetClass = (WidgetClass) &externalShellClassRec; static void -ExternalShellInitialize (Widget req, Widget new, ArgList args, - Cardinal *num_args) +ExternalShellInitialize (Widget req, Widget new, ArgList UNUSED (args), + Cardinal *UNUSED (num_args)) { XtAddEventHandler(new, 0, TRUE, EventHandler, (XtPointer) NULL); @@ -276,9 +276,9 @@ # define XtCXtToolkitError "XtToolkitError" #endif -static void EventHandler (Widget wid, XtPointer closure /* unused */, +static void EventHandler (Widget wid, XtPointer UNUSED (closure), XEvent *event, - Boolean *continue_to_dispatch /* unused */) + Boolean *UNUSED (continue_to_dispatch)) { ExternalShellWidget w = (ExternalShellWidget) wid; @@ -364,7 +364,7 @@ /* Lifted almost entirely from GetGeometry() in Shell.c */ static void -GetGeometry (Widget W, Widget child) +GetGeometry (Widget W, Widget UNUSED (child)) { ExternalShellWidget w = (ExternalShellWidget)W; int x, y, win_gravity = -1, flag;
--- a/src/alloc.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/alloc.c Mon Sep 20 19:20:08 2004 +0000 @@ -2036,7 +2036,7 @@ } static int -string_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) +string_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) { Bytecount len; return (((len = XSTRING_LENGTH (obj1)) == XSTRING_LENGTH (obj2)) && @@ -3532,7 +3532,13 @@ seen yet, recursively mark all the references contained in it. */ void -mark_object (Lisp_Object obj) +mark_object ( +#ifdef USE_KKCC + Lisp_Object UNUSED (obj) +#else + Lisp_Object obj +#endif + ) { #ifdef USE_KKCC /* this code should never be reached when configured for KKCC */ @@ -5129,7 +5135,7 @@ that some minimum block size is imposed (e.g. 16 bytes). */ Bytecount -malloced_storage_size (void *ptr, Bytecount claimed_size, +malloced_storage_size (void *UNUSED (ptr), Bytecount claimed_size, struct overhead_stats *stats) { Bytecount orig_claimed_size = claimed_size;
--- a/src/balloon_help.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/balloon_help.c Mon Sep 20 19:20:08 2004 +0000 @@ -42,6 +42,7 @@ #include <X11/Xutil.h> #include <X11/extensions/shape.h> +#include "compiler.h" #include "xintrinsic.h" #include "balloon_help.h" @@ -229,8 +230,8 @@ } static void -get_text_size (Display* dpy, XFontStruct* fontStruct, const char* text, - int* max_width, int* max_height) +get_text_size (Display* UNUSED (dpy), XFontStruct* fontStruct, + const char* text, int* max_width, int* max_height) { int width; int height; @@ -307,7 +308,7 @@ } static void -make_mask (int shape, int x, int y, int width, int height) +make_mask (int shape, int UNUSED (x), int UNUSED (y), int width, int height) { XPoint cone[ 3 ]; @@ -336,7 +337,7 @@ } static void -show_help (XtPointer data, XtIntervalId* id) +show_help (XtPointer UNUSED (data), XtIntervalId* id) { int x, y; int shape;
--- a/src/bytecode.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/bytecode.c Mon Sep 20 19:20:08 2004 +0000 @@ -1348,7 +1348,7 @@ Don't make this function static, since then the compiler might inline it. */ Lisp_Object * execute_rare_opcode (Lisp_Object *stack_ptr, - const Opbyte *program_ptr, + const Opbyte *UNUSED (program_ptr), Opcode opcode) { switch (opcode)
--- a/src/callint.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/callint.c Mon Sep 20 19:20:08 2004 +0000 @@ -206,7 +206,7 @@ `_' (setq zmacs-region-stays t) */ - (args)) + (UNUSED (args))) { return Qnil; }
--- a/src/casetab.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/casetab.c Mon Sep 20 19:20:08 2004 +0000 @@ -85,7 +85,8 @@ } static void -print_case_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_case_table (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { Lisp_Case_Table *ct = XCASE_TABLE (obj); if (print_readably) @@ -286,7 +287,7 @@ static int compute_canon_mapper (struct chartab_range *range, - Lisp_Object table, Lisp_Object val, void *arg) + Lisp_Object UNUSED (table), Lisp_Object val, void *arg) { Lisp_Object casetab = VOID_TO_LISP (arg); if (range->type == CHARTAB_RANGE_CHAR) @@ -300,7 +301,8 @@ static int initialize_identity_mapper (struct chartab_range *range, - Lisp_Object table, Lisp_Object val, void *arg) + Lisp_Object UNUSED (table), + Lisp_Object UNUSED (val), void *arg) { Lisp_Object trt = VOID_TO_LISP (arg); if (range->type == CHARTAB_RANGE_CHAR) @@ -311,7 +313,8 @@ static int compute_up_or_eqv_mapper (struct chartab_range *range, - Lisp_Object table, Lisp_Object val, void *arg) + Lisp_Object UNUSED (table), + Lisp_Object val, void *arg) { Lisp_Object inverse = VOID_TO_LISP (arg); Ichar toch = XCHAR (val);
--- a/src/chartab.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/chartab.c Mon Sep 20 19:20:08 2004 +0000 @@ -306,7 +306,7 @@ }; static int -print_table_entry (struct chartab_range *range, Lisp_Object table, +print_table_entry (struct chartab_range *range, Lisp_Object UNUSED (table), Lisp_Object val, void *arg) { struct ptemap *a = (struct ptemap *) arg; @@ -323,7 +323,8 @@ } static void -print_char_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_char_table (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { Lisp_Char_Table *ct = XCHAR_TABLE (obj); struct chartab_range range; @@ -779,7 +780,7 @@ } static int -copy_mapper (struct chartab_range *range, Lisp_Object table, +copy_mapper (struct chartab_range *range, Lisp_Object UNUSED (table), Lisp_Object val, void *arg) { put_char_table (VOID_TO_LISP (arg), range, val); @@ -1439,7 +1440,8 @@ static int slow_map_char_table_fun (struct chartab_range *range, - Lisp_Object table, Lisp_Object val, void *arg) + Lisp_Object UNUSED (table), Lisp_Object val, + void *arg) { struct slow_map_char_table_arg *closure = (struct slow_map_char_table_arg *) arg; @@ -1483,8 +1485,8 @@ /************************************************************************/ static int -chartab_type_validate (Lisp_Object keyword, Lisp_Object value, - Error_Behavior errb) +chartab_type_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, + Error_Behavior UNUSED (errb)) { /* #### should deal with ERRB */ symbol_to_char_table_type (value); @@ -1494,8 +1496,8 @@ /* #### Document the print/read format; esp. what's this cons element? */ static int -chartab_data_validate (Lisp_Object keyword, Lisp_Object value, - Error_Behavior errb) +chartab_data_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, + Error_Behavior UNUSED (errb)) { Lisp_Object rest;
--- a/src/cm.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/cm.c Mon Sep 20 19:20:08 2004 +0000 @@ -43,7 +43,7 @@ static int cm_cost_counter; /* sums up costs */ static void -evalcost (int c) +evalcost (int UNUSED (c)) { cm_cost_counter++; }
--- a/src/cmdloop.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/cmdloop.c Mon Sep 20 19:20:08 2004 +0000 @@ -200,7 +200,7 @@ static Lisp_Object -cmd_error (Lisp_Object data, Lisp_Object dummy) +cmd_error (Lisp_Object data, Lisp_Object UNUSED (dummy)) { /* This function can GC */ check_quit (); /* make Vquit_flag accurate */ @@ -215,7 +215,7 @@ } static Lisp_Object -top_level_1 (Lisp_Object dummy) +top_level_1 (Lisp_Object UNUSED (dummy)) { /* This function can GC */ /* On entry to the outer level, run the startup file */ @@ -270,7 +270,7 @@ static DECLARE_DOESNT_RETURN_TYPE (Lisp_Object, command_loop_2 (Lisp_Object)); static DOESNT_RETURN_TYPE (Lisp_Object) -command_loop_2 (Lisp_Object dummy) +command_loop_2 (Lisp_Object UNUSED (dummy)) { command_loop_3(); /* doesn't return */ RETURN_NOT_REACHED (Qnil); @@ -498,7 +498,7 @@ #else static DOESNT_RETURN_TYPE (Lisp_Object) #endif -command_loop_1 (Lisp_Object dummy) +command_loop_1 (Lisp_Object UNUSED (dummy)) { /* This function can GC */ /* #### not correct with Vselected_console */
--- a/src/compiler.h Mon Sep 20 19:11:29 2004 +0000 +++ b/src/compiler.h Mon Sep 20 19:20:08 2004 +0000 @@ -28,7 +28,7 @@ Many changes and improvements by Jerry James, 2003. Split out of lisp.h, reorganized, and modernized. {BEGIN,END}_C_DECLS, NEED_GCC, GCC_VERSION - ATTRIBUTE_MALLOC, ATTRIBUTE_CONST, ATTRIBUTE_PURE, UNUSED_ARG + ATTRIBUTE_MALLOC, ATTRIBUTE_CONST, ATTRIBUTE_PURE, UNUSED */ #ifndef INCLUDED_compiler_h @@ -193,14 +193,18 @@ # endif /* GCC_VERSION >= NEED_GCC (2, 5, 0) */ #endif /* ATTRIBUTE_CONST */ -/* Unused declarations; g++ doesn't support this. */ +/* Unused declarations; g++ and icc do not support this. */ #ifndef UNUSED_ARG -# if defined(__GNUC__) && !defined(__cplusplus) -# define UNUSED_ARG __attribute__ ((unused)) +# define UNUSED_ARG(decl) unused_##decl +#endif +#ifndef UNUSED +# if defined(__GNUC__) && !defined(__cplusplus) && !defined(__INTEL_COMPILER) +# define ATTRIBUTE_UNUSED __attribute__ ((unused)) # else -# define UNUSED_ARG +# define ATTRIBUTE_UNUSED # endif -#endif /* ATTRIBUTE_UNUSED */ +# define UNUSED(decl) UNUSED_ARG (decl) ATTRIBUTE_UNUSED +#endif /* UNUSED */ #ifdef DEBUG_XEMACS # define REGISTER
--- a/src/console-gtk.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/console-gtk.c Mon Sep 20 19:20:08 2004 +0000 @@ -37,7 +37,7 @@ DEFINE_CONSOLE_TYPE (gtk); static int -gtk_initially_selected_for_input (struct console *con) +gtk_initially_selected_for_input (struct console *UNUSED (con)) { return 1; } @@ -46,7 +46,8 @@ the integrity of our input, because the generic functions don't. */ static Lisp_Object -gtk_device_to_console_connection (Lisp_Object connection, Error_Behavior errb) +gtk_device_to_console_connection (Lisp_Object connection, + Error_Behavior UNUSED (errb)) { /* Strip the trailing .# off of the connection, if it's there. */ @@ -61,7 +62,7 @@ static Lisp_Object gtk_semi_canonicalize_console_connection (Lisp_Object connection, - Error_Behavior errb) + Error_Behavior UNUSED (errb)) { struct gcpro gcpro1; @@ -73,7 +74,8 @@ } static Lisp_Object -gtk_canonicalize_console_connection (Lisp_Object connection, Error_Behavior errb) +gtk_canonicalize_console_connection (Lisp_Object connection, + Error_Behavior UNUSED (errb)) { Lisp_Object hostname = Qnil; struct gcpro gcpro1, gcpro2; @@ -87,7 +89,7 @@ static Lisp_Object gtk_semi_canonicalize_device_connection (Lisp_Object connection, - Error_Behavior errb) + Error_Behavior UNUSED (errb)) { struct gcpro gcpro1; @@ -99,7 +101,8 @@ } static Lisp_Object -gtk_canonicalize_device_connection (Lisp_Object connection, Error_Behavior errb) +gtk_canonicalize_device_connection (Lisp_Object connection, + Error_Behavior UNUSED (errb)) { struct gcpro gcpro1;
--- a/src/console-msw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/console-msw.c Mon Sep 20 19:20:08 2004 +0000 @@ -80,7 +80,7 @@ /************************************************************************/ static int -mswindows_initially_selected_for_input (struct console *con) +mswindows_initially_selected_for_input (struct console *UNUSED (con)) { return 1; }
--- a/src/console-stream.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/console-stream.c Mon Sep 20 19:20:08 2004 +0000 @@ -58,7 +58,7 @@ }; static void -stream_init_console (struct console *con, Lisp_Object params) +stream_init_console (struct console *con, Lisp_Object UNUSED (params)) { Lisp_Object tty = CONSOLE_CONNECTION (con); struct stream_console *stream_con; @@ -90,7 +90,7 @@ } static void -stream_init_device (struct device *d, Lisp_Object params) +stream_init_device (struct device *d, Lisp_Object UNUSED (params)) { struct console *con = XCONSOLE (DEVICE_CONSOLE (d)); @@ -101,7 +101,7 @@ } static int -stream_initially_selected_for_input (struct console *con) +stream_initially_selected_for_input (struct console *UNUSED (con)) { return noninteractive && initialized; } @@ -130,7 +130,7 @@ Lisp_Object stream_semi_canonicalize_console_connection (Lisp_Object connection, - Error_Behavior errb) + Error_Behavior UNUSED (errb)) { return NILP (connection) ? Vstdio_str : connection; } @@ -169,7 +169,7 @@ static void -stream_init_frame_1 (struct frame *f, Lisp_Object props, +stream_init_frame_1 (struct frame *f, Lisp_Object UNUSED (props), int frame_name_is_defaulted) { #if 0 @@ -186,20 +186,21 @@ static int -stream_text_width (struct frame *f, struct face_cachel *cachel, - const Ichar *str, Charcount len) +stream_text_width (struct frame *UNUSED (f), + struct face_cachel *UNUSED (cachel), + const Ichar *UNUSED (str), Charcount len) { return len; } static int -stream_left_margin_width (struct window *w) +stream_left_margin_width (struct window *UNUSED (w)) { return 0; } static int -stream_right_margin_width (struct window *w) +stream_right_margin_width (struct window *UNUSED (w)) { return 0; } @@ -224,55 +225,61 @@ is a few changes to the redisplay critical-section handling. */ static void -stream_window_output_begin (struct window *w) +stream_window_output_begin (struct window *UNUSED (w)) { abort (); } static void -stream_window_output_end (struct window *w) +stream_window_output_end (struct window *UNUSED (w)) { abort (); } static void -stream_frame_output_begin (struct frame *f) +stream_frame_output_begin (struct frame *UNUSED (f)) { abort (); } static void -stream_frame_output_end (struct frame *f) +stream_frame_output_end (struct frame *UNUSED (f)) { abort (); } static void -stream_output_display_block (struct window *w, struct display_line *dl, - int block, int start, int end, - int start_pixpos, int cursor_start, - int cursor_width, int cursor_height) +stream_output_display_block (struct window *UNUSED (w), + struct display_line *UNUSED (dl), + int UNUSED (block), int UNUSED (start), + int UNUSED (end), int UNUSED (start_pixpos), + int UNUSED (cursor_start), + int UNUSED (cursor_width), + int UNUSED (cursor_height)) { abort (); } static void -stream_clear_region (Lisp_Object window, struct device* d, struct frame * f, - face_index findex, int x, int y, - int width, int height, Lisp_Object fcolor, - Lisp_Object bcolor, Lisp_Object background_pixmap) +stream_clear_region (Lisp_Object UNUSED (window), struct device* UNUSED (d), + struct frame *UNUSED (f), face_index UNUSED (findex), + int UNUSED (x), int UNUSED (y), int UNUSED (width), + int UNUSED (height), Lisp_Object UNUSED (fcolor), + Lisp_Object UNUSED (bcolor), + Lisp_Object UNUSED (background_pixmap)) { abort (); } static int -stream_flash (struct device *d) +stream_flash (struct device *UNUSED (d)) { return 0; /* sorry can't do it */ } static void -stream_ring_bell (struct device *d, int volume, int pitch, int duration) +stream_ring_bell (struct device *d, int UNUSED (volume), int UNUSED (pitch), + int UNUSED (duration)) { struct console *c = XCONSOLE (DEVICE_CONSOLE (d)); /* Don't output ^G when not a TTY -- in particular, under MS Windows, ^G
--- a/src/console-tty.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/console-tty.c Mon Sep 20 19:20:08 2004 +0000 @@ -183,7 +183,7 @@ } static int -tty_initially_selected_for_input (struct console *con) +tty_initially_selected_for_input (struct console *UNUSED (con)) { return 1; }
--- a/src/console-x.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/console-x.c Mon Sep 20 19:20:08 2004 +0000 @@ -39,7 +39,7 @@ DEFINE_CONSOLE_TYPE (x); static int -x_initially_selected_for_input (struct console *con) +x_initially_selected_for_input (struct console *UNUSED (con)) { return 1; }
--- a/src/console.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/console.c Mon Sep 20 19:20:08 2004 +0000 @@ -149,7 +149,8 @@ } static void -print_console (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_console (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { struct console *con = XCONSOLE (obj); @@ -974,7 +975,13 @@ Then in any case stuff anything Emacs has read ahead and not used. */ void -stuff_buffered_input (Lisp_Object stuffstring) +stuff_buffered_input ( +#ifdef BSD + Lisp_Object stuffstring +#else + Lisp_Object UNUSED (stuffstring) +#endif + ) { /* stuff_char works only in BSD, versions 4.2 and up. */ #if defined (BSD) @@ -1102,7 +1109,7 @@ the selected console. See also `current-input-mode'. */ - (ignored, flow, meta, quit, console)) + (UNUSED (ignored), flow, meta, quit, console)) { struct console *con = decode_console (console); int meta_key = (!CONSOLE_TTY_P (con) ? 1 :
--- a/src/data.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/data.c Mon Sep 20 19:20:08 2004 +0000 @@ -2536,13 +2536,14 @@ static Lisp_Object encode_weak_list_type (enum weak_list_type type); static Lisp_Object -mark_weak_list (Lisp_Object obj) +mark_weak_list (Lisp_Object UNUSED (obj)) { return Qnil; /* nichts ist gemarkt */ } static void -print_weak_list (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_weak_list (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { if (print_readably) printing_unreadable_object ("#<weak-list>"); @@ -3014,13 +3015,14 @@ } static Lisp_Object -mark_weak_box (Lisp_Object obj) +mark_weak_box (Lisp_Object UNUSED (obj)) { return Qnil; } static void -print_weak_box (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_weak_box (Lisp_Object UNUSED (obj), Lisp_Object printcharfun, + int UNUSED (escapeflag)) { if (print_readably) printing_unreadable_object ("#<weak_box>"); @@ -3239,13 +3241,14 @@ } static Lisp_Object -mark_ephemeron (Lisp_Object obj) +mark_ephemeron (Lisp_Object UNUSED (obj)) { return Qnil; } static void -print_ephemeron (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_ephemeron (Lisp_Object UNUSED (obj), Lisp_Object printcharfun, + int UNUSED (escapeflag)) { if (print_readably) printing_unreadable_object ("#<ephemeron>");
--- a/src/database.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/database.c Mon Sep 20 19:20:08 2004 +0000 @@ -161,7 +161,8 @@ } static void -print_database (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_database (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { Lisp_Database *db = XDATABASE (obj); @@ -368,7 +369,7 @@ #ifdef HAVE_BERKELEY_DB static Lisp_Object -berkdb_type (Lisp_Database *db) +berkdb_type (Lisp_Database *UNUSED (db)) { return Qberkeley_db; }
--- a/src/device-gtk.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/device-gtk.c Mon Sep 20 19:20:08 2004 +0000 @@ -199,16 +199,13 @@ } static void -gtk_init_device (struct device *d, Lisp_Object props) +gtk_init_device (struct device *d, Lisp_Object UNUSED (props)) { - Lisp_Object device; Lisp_Object display; GtkWidget *app_shell = NULL; GdkVisual *visual = NULL; GdkColormap *cmap = NULL; - device = wrap_device (d); - /* gtk_init() and even gtk_check_init() are so brain dead that getting an empty argv array causes them to abort. */ if (NILP (Vgtk_initial_argv_list)) @@ -331,7 +328,7 @@ } static void -gtk_finish_init_device (struct device *d, Lisp_Object props) +gtk_finish_init_device (struct device *UNUSED (d), Lisp_Object UNUSED (props)) { call0 (Qinit_post_gtk_win); } @@ -357,14 +354,11 @@ static void gtk_delete_device (struct device *d) { - Lisp_Object device; - #ifdef FREE_CHECKING extern void (*__free_hook)(); int checking_free; #endif - device = wrap_device (d); if (1) { #ifdef FREE_CHECKING @@ -538,7 +532,7 @@ keyboard events during the grab. Returns t if the grab is successful, nil otherwise. */ - (device, cursor, ignore_keyboard)) + (device, cursor, UNUSED (ignore_keyboard))) { GdkWindow *w; int result; @@ -614,7 +608,7 @@ DEFUN ("gtk-ungrab-keyboard", Fgtk_ungrab_keyboard, 0, 1, 0, /* Release a keyboard grab made with `gtk-grab-keyboard'. */ - (device)) + (UNUSED (device))) { gdk_keyboard_ungrab (GDK_CURRENT_TIME); return Qnil;
--- a/src/device-msw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/device-msw.c Mon Sep 20 19:20:08 2004 +0000 @@ -136,7 +136,7 @@ /************************************************************************/ static void -mswindows_init_device (struct device *d, Lisp_Object props) +mswindows_init_device (struct device *d, Lisp_Object UNUSED (props)) { HDC hdc; WNDCLASSEXW wc; @@ -252,7 +252,8 @@ } static void -mswindows_finish_init_device (struct device *d, Lisp_Object props) +mswindows_finish_init_device (struct device *UNUSED (d), + Lisp_Object UNUSED (props)) { #ifdef HAVE_DRAGNDROP /* Tell pending clients we are ready. */ @@ -488,7 +489,7 @@ /************************************************************************/ static void -msprinter_init_device (struct device *d, Lisp_Object props) +msprinter_init_device (struct device *d, Lisp_Object UNUSED (props)) { DEVMODEW *pdm; LONG dm_size; @@ -790,7 +791,7 @@ } Lisp_Object -mswindows_handle_print_dialog_box (struct frame *f, Lisp_Object keys) +mswindows_handle_print_dialog_box (struct frame *UNUSED (f), Lisp_Object keys) { Lisp_Object device = Qunbound, settings = Qunbound; DWORD flags = PD_NOSELECTION; @@ -870,7 +871,8 @@ } Lisp_Object -mswindows_handle_page_setup_dialog_box (struct frame *f, Lisp_Object keys) +mswindows_handle_page_setup_dialog_box (struct frame *UNUSED (f), + Lisp_Object keys) { Lisp_Object device = Qunbound, settings = Qunbound; Lisp_Object plist = Qnil; @@ -1114,7 +1116,7 @@ static void print_devmode (Lisp_Object obj, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { Lisp_Devmode *dm = XDEVMODE (obj); if (print_readably) @@ -1146,7 +1148,7 @@ } static int -equal_devmode (Lisp_Object obj1, Lisp_Object obj2, int depth) +equal_devmode (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) { Lisp_Devmode *dm1 = XDEVMODE (obj1); Lisp_Devmode *dm2 = XDEVMODE (obj2);
--- a/src/device-tty.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/device-tty.c Mon Sep 20 19:20:08 2004 +0000 @@ -51,7 +51,7 @@ } static void -tty_init_device (struct device *d, Lisp_Object props) +tty_init_device (struct device *d, Lisp_Object UNUSED (props)) { struct console *con = XCONSOLE (DEVICE_CONSOLE (d)); Lisp_Object terminal_type = CONSOLE_TTY_DATA (con)->terminal_type; @@ -113,7 +113,7 @@ #ifdef SIGWINCH static SIGTYPE -tty_device_size_change_signal (int signo) +tty_device_size_change_signal (int UNUSED (signo)) { int old_errno = errno; asynch_device_change_pending++;
--- a/src/device-x.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/device-x.c Mon Sep 20 19:20:08 2004 +0000 @@ -492,7 +492,7 @@ static void -x_init_device (struct device *d, Lisp_Object props) +x_init_device (struct device *d, Lisp_Object UNUSED (props)) { Lisp_Object display; Display *dpy; @@ -857,7 +857,7 @@ } static void -x_finish_init_device (struct device *d, Lisp_Object props) +x_finish_init_device (struct device *UNUSED (d), Lisp_Object UNUSED (props)) { call0 (Qinit_post_x_win); }
--- a/src/device.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/device.c Mon Sep 20 19:20:08 2004 +0000 @@ -139,7 +139,8 @@ } static void -print_device (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_device (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { struct device *d = XDEVICE (obj);
--- a/src/dialog-gtk.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/dialog-gtk.c Mon Sep 20 19:20:08 2004 +0000 @@ -39,7 +39,8 @@ /* We just bounce up into lisp here... see $(srcdir)/lisp/dialog-gtk.el */ static Lisp_Object -gtk_make_dialog_box_internal (struct frame* f, Lisp_Object type, Lisp_Object keys) +gtk_make_dialog_box_internal (struct frame* UNUSED (f), Lisp_Object type, + Lisp_Object keys) { return (call2 (Qgtk_make_dialog_box_internal, type, keys)); }
--- a/src/dialog-msw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/dialog-msw.c Mon Sep 20 19:20:08 2004 +0000 @@ -280,7 +280,7 @@ /* Unwind protection decrements dialog count */ static Lisp_Object -dialog_popped_down (Lisp_Object arg) +dialog_popped_down (Lisp_Object UNUSED (arg)) { popup_up_p--; return Qnil;
--- a/src/dialog-x.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/dialog-x.c Mon Sep 20 19:20:08 2004 +0000 @@ -128,8 +128,8 @@ int count; Lisp_Object wv_closure, gui_item; Lisp_Object question = Qnil; - Lisp_Object title = Qnil; /* #### currently unused */ Lisp_Object buttons = Qnil; + /* Lisp_Object title = Qnil; #### currently unused */ { EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys) @@ -142,7 +142,7 @@ else if (EQ (key, Q_title)) { CHECK_STRING (value); - title = value; + /* title = value; */ } else if (EQ (key, Q_buttons)) { @@ -253,7 +253,7 @@ { int dbox_id; widget_value *data; - Widget parent, dbox; + Widget parent; if (!EQ (type, Qquestion)) signal_error (Qunimplemented, "Dialog box type", type); @@ -263,7 +263,7 @@ parent = FRAME_X_SHELL_WIDGET (f); dbox_id = new_lwlib_id (); - dbox = lw_create_widget (data->name, "dialog", dbox_id, data, parent, 1, 0, + (void) lw_create_widget (data->name, "dialog", dbox_id, data, parent, 1, 0, dbox_selection_callback, 0); lw_modify_all_widgets (dbox_id, data, True); lw_modify_all_widgets (dbox_id, data->contents, True);
--- a/src/dired.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/dired.c Mon Sep 20 19:20:08 2004 +0000 @@ -290,7 +290,7 @@ static Lisp_Object file_name_completion (Lisp_Object file, Lisp_Object directory, int all_flag, - int ver_flag) + int UNUSED (ver_flag)) { /* This function can GC */ DIR *d = 0;
--- a/src/dumper.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/dumper.c Mon Sep 20 19:20:08 2004 +0000 @@ -961,7 +961,7 @@ static void pdump_allocate_offset (pdump_entry_list_elt *elt, - const struct memory_description *desc) + const struct memory_description *UNUSED (desc)) { Bytecount size = elt->count * elt->size; elt->save_offset = cur_offset;
--- a/src/editfns.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/editfns.c Mon Sep 20 19:20:08 2004 +0000 @@ -1553,7 +1553,7 @@ The optional fourth arg BUFFER specifies the buffer to insert the text into. If BUFFER is nil, the current buffer is assumed. */ - (character, count, ignored, buffer)) + (character, count, UNUSED (ignored), buffer)) { /* This function can GC */ REGISTER Ibyte *string; @@ -2329,7 +2329,7 @@ Transposing beyond buffer boundaries is an error. */ - (start1, end1, start2, end2, leave_markers)) + (start1, end1, start2, end2, UNUSED (leave_markers))) { Charbpos startr1, endr1, startr2, endr2; Charcount len1, len2;
--- a/src/elhash.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/elhash.c Mon Sep 20 19:20:08 2004 +0000 @@ -297,7 +297,7 @@ Examining all entries is too expensive, and examining a random subset does not yield a correct hash function. */ static Hashcode -hash_table_hash (Lisp_Object hash_table, int depth) +hash_table_hash (Lisp_Object hash_table, int UNUSED (depth)) { return XHASH_TABLE (hash_table)->count; } @@ -356,7 +356,8 @@ } static void -print_hash_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_hash_table (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { Lisp_Hash_Table *ht = XHASH_TABLE (obj); @@ -599,14 +600,14 @@ function. The errors should maybe be continuable, but it is unclear how this would cope with ERRB. */ static int -hash_table_size_validate (Lisp_Object keyword, Lisp_Object value, - Error_Behavior errb) +hash_table_size_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, + Error_Behavior errb) { if (NATNUMP (value)) return 1; maybe_signal_error_1 (Qwrong_type_argument, list2 (Qnatnump, value), - Qhash_table, errb); + Qhash_table, errb); return 0; } @@ -617,7 +618,7 @@ } static int -hash_table_weakness_validate (Lisp_Object keyword, Lisp_Object value, +hash_table_weakness_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, Error_Behavior errb) { if (EQ (value, Qnil)) return 1; @@ -661,8 +662,8 @@ } static int -hash_table_test_validate (Lisp_Object keyword, Lisp_Object value, - Error_Behavior errb) +hash_table_test_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, + Error_Behavior errb) { if (EQ (value, Qnil)) return 1; if (EQ (value, Qeq)) return 1; @@ -670,7 +671,7 @@ if (EQ (value, Qeql)) return 1; maybe_invalid_constant ("Invalid hash table test", - value, Qhash_table, errb); + value, Qhash_table, errb); return 0; } @@ -687,8 +688,8 @@ } static int -hash_table_rehash_size_validate (Lisp_Object keyword, Lisp_Object value, - Error_Behavior errb) +hash_table_rehash_size_validate (Lisp_Object UNUSED (keyword), + Lisp_Object value, Error_Behavior errb) { if (!FLOATP (value)) { @@ -718,8 +719,8 @@ } static int -hash_table_rehash_threshold_validate (Lisp_Object keyword, Lisp_Object value, - Error_Behavior errb) +hash_table_rehash_threshold_validate (Lisp_Object UNUSED (keyword), + Lisp_Object value, Error_Behavior errb) { if (!FLOATP (value)) { @@ -749,8 +750,8 @@ } static int -hash_table_data_validate (Lisp_Object keyword, Lisp_Object value, - Error_Behavior errb) +hash_table_data_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, + Error_Behavior errb) { int len;
--- a/src/emacs.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/emacs.c Mon Sep 20 19:20:08 2004 +0000 @@ -702,7 +702,13 @@ */ DECLARE_DOESNT_RETURN (main_1 (int, Extbyte **, Extbyte **, int)); DOESNT_RETURN -main_1 (int argc, Extbyte **argv, Extbyte **envp, int restart) +main_1 (int argc, Extbyte **argv, +#if defined (WIN32_NATIVE) || defined (_SCO_DS) + Extbyte **envp, +#else + Extbyte **UNUSED (envp), +#endif + int restart) { char stack_bottom_variable; int skip_args = 0; @@ -3361,12 +3367,12 @@ /* GCC >= 2.8. -slb */ #if defined (GNU_MALLOC) static void -voodoo_free_hook (void *mem) +voodoo_free_hook (void *UNUSED (mem)) { /* Disable all calls to free() when XEmacs is exiting and it doesn't */ /* matter. */ __free_hook = -#ifdef TYPEOF +#if defined (TYPEOF) && !defined (UNO) /* prototype of __free_hook varies with glibc version */ (TYPEOF (__free_hook)) #endif @@ -3432,7 +3438,7 @@ #if defined (GNU_MALLOC) __free_hook = -#ifdef TYPEOF +#if defined (TYPEOF) && !defined (UNO) /* prototype of __free_hook varies with glibc version */ (TYPEOF (__free_hook)) #endif
--- a/src/esd.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/esd.c Mon Sep 20 19:20:08 2004 +0000 @@ -37,14 +37,14 @@ int esd_play_sound_file (Extbyte *file, int vol); int -esd_play_sound_file (Extbyte *file, int vol) +esd_play_sound_file (Extbyte *file, int UNUSED (vol)) { /* #### FIXME: vol is ignored */ return esd_play_file(ESD_NAME, file, 0); } int esd_play_sound_data (UChar_Binary *data, size_t length, int vol); int -esd_play_sound_data (UChar_Binary *data, size_t length, int vol) +esd_play_sound_data (UChar_Binary *data, size_t length, int UNUSED (vol)) { /* #### FIXME: vol is ignored */ size_t (*parsesndfile)(void **dayta,size_t *sz,void **outbuf); size_t (*sndcnv)(void **dayta,size_t *sz,void **);
--- a/src/eval.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/eval.c Mon Sep 20 19:20:08 2004 +0000 @@ -411,7 +411,7 @@ /************************************************************************/ static void -print_subr (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_subr (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag)) { Lisp_Subr *subr = XSUBR (obj); const CIbyte *header = @@ -4747,7 +4747,7 @@ } void -check_allowed_operation (int what, Lisp_Object obj, Lisp_Object prop) +check_allowed_operation (int what, Lisp_Object obj, Lisp_Object UNUSED (prop)) { if (inhibit_flags & INHIBIT_EXISTING_BUFFER_TEXT_MODIFICATION) {
--- a/src/event-Xt.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/event-Xt.c Mon Sep 20 19:20:08 2004 +0000 @@ -851,7 +851,7 @@ Of course, we DO worry about it, so we need a special translation. */ void -emacs_Xt_mapping_action (Widget w, XEvent *event) +emacs_Xt_mapping_action (Widget UNUSED (w), XEvent *event) { struct device *d = get_device_from_display (event->xany.display); @@ -2086,7 +2086,7 @@ /* called by XtAppNextEvent() */ static void -Xt_timeout_callback (XtPointer closure, XtIntervalId *id) +Xt_timeout_callback (XtPointer closure, XtIntervalId *UNUSED (id)) { struct Xt_timeout *timeout = (struct Xt_timeout *) closure; struct Xt_timeout *t2 = pending_timeouts; @@ -2271,7 +2271,7 @@ } static void -Xt_what_callback (void *closure, int *source, XtInputId *id) +Xt_what_callback (void *closure, int *UNUSED (source), XtInputId *UNUSED (id)) { /* If closure is 0, then we got a fake event from a signal handler. The only purpose of this is to make XtAppProcessEvent() stop @@ -2415,7 +2415,7 @@ If we've still got pointers to it in this file, we're gonna lose hard. */ void -debug_process_finalization (Lisp_Process *p) +debug_process_finalization (Lisp_Process *UNUSED (p)) { #if 0 /* #### */ int i; @@ -2879,10 +2879,10 @@ } void -emacs_Xt_event_handler (Widget wid /* unused */, - XtPointer closure /* unused */, +emacs_Xt_event_handler (Widget UNUSED (wid), + XtPointer UNUSED (closure), XEvent *event, - Boolean *continue_to_dispatch /* unused */) + Boolean *UNUSED (continue_to_dispatch)) { Lisp_Object emacs_event = Fmake_event (Qnil, Qnil); @@ -3138,8 +3138,8 @@ static void emacs_Xt_event_widget_focus_in (Widget w, XEvent *event, - String *params, - Cardinal *num_params) + String *UNUSED (params), + Cardinal *UNUSED (num_params)) { struct frame *f = x_any_widget_or_parent_to_frame (get_device_from_display (event->xany.display), w); @@ -3148,10 +3148,10 @@ } static void -emacs_Xt_event_widget_focus_out (Widget w, - XEvent *event, - String *params, - Cardinal *num_params) +emacs_Xt_event_widget_focus_out (Widget UNUSED (w), + XEvent *UNUSED (event), + String *UNUSED (params), + Cardinal *UNUSED (num_params)) { }
--- a/src/event-gtk.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/event-gtk.c Mon Sep 20 19:20:08 2004 +0000 @@ -708,7 +708,8 @@ } static void -gtk_what_callback (gpointer closure, gint source, GdkInputCondition why) +gtk_what_callback (gpointer closure, gint UNUSED (source), + GdkInputCondition UNUSED (why)) { /* If closure is 0, then we got a fake event from a signal handler. The only purpose of this is to make XtAppProcessEvent() stop @@ -850,7 +851,7 @@ If we've still got pointers to it in this file, we're gonna lose hard. */ void -debug_process_finalization (struct Lisp_Process *p) +debug_process_finalization (struct Lisp_Process *UNUSED (p)) { #if 0 /* #### */ int i; @@ -968,7 +969,7 @@ gint x, gint y, GtkSelectionData *data, - guint info, + guint UNUSED (info), guint time) { Lisp_Object event = Fmake_event (Qnil, Qnil); @@ -1056,10 +1057,10 @@ } gboolean -dragndrop_dropped (GtkWidget *widget, +dragndrop_dropped (GtkWidget *UNUSED (widget), GdkDragContext *drag_context, - gint x, - gint y, + gint UNUSED (x), + gint UNUSED (y), guint time, gpointer user_data) { @@ -1515,7 +1516,7 @@ } gboolean -emacs_shell_event_handler (GtkWidget *wid /* unused */, +emacs_shell_event_handler (GtkWidget *UNUSED (wid), GdkEvent *event, gpointer closure) { @@ -1598,7 +1599,7 @@ } static void -emacs_gtk_force_event_pending (struct frame* f) +emacs_gtk_force_event_pending (struct frame* UNUSED (f)) { #if 0 stderr_out ("Force event pending called on frame %p!\n", f);
--- a/src/event-msw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/event-msw.c Mon Sep 20 19:20:08 2004 +0000 @@ -39,6 +39,14 @@ #include <config.h> #include "lisp.h" +#ifdef CYGWIN +# define USED_IF_CYGWIN(decl) decl +# define UNUSED_IF_CYGWIN(decl) UNUSED (decl) +#else +# define USED_IF_CYGWIN(decl) UNUSED (decl) +# define UNUSED_IF_CYGWIN(decl) decl +#endif + #if defined (CYGWIN) && !defined (HAVE_MSG_SELECT) #error We do not support non-select() versions (i.e. very old) of Cygwin. #endif @@ -1107,7 +1115,7 @@ * handle since it will be invalid and will cause the wait to fail */ void -mswindows_unwait_process (Lisp_Process *p) +mswindows_unwait_process (Lisp_Process *UNUSED_IF_CYGWIN (p)) { #ifndef CYGWIN remove_waitable_handle (get_nt_process_handle (p)); @@ -1145,7 +1153,7 @@ * condition_case. See mswindows_pump_outstanding_events */ static Lisp_Object -mswindows_unsafe_pump_events (void *arg) +mswindows_unsafe_pump_events (void *UNUSED (arg)) { /* This function can call lisp */ Lisp_Object event = Fmake_event (Qnil, Qnil); @@ -1669,7 +1677,8 @@ * Callback procedure for synchronous timer messages */ static void CALLBACK -mswindows_wm_timer_callback (HWND hwnd, UINT umsg, UINT id_timer, DWORD dwtime) +mswindows_wm_timer_callback (HWND UNUSED (hwnd), UINT UNUSED (umsg), + UINT id_timer, DWORD dwtime) { Lisp_Object emacs_event = Fmake_event (Qnil, Qnil); @@ -1712,7 +1721,7 @@ static Lisp_Object dde_eval_error; static Lisp_Object -dde_error (Lisp_Object err, Lisp_Object obj) +dde_error (Lisp_Object err, Lisp_Object UNUSED (obj)) { dde_eval_error = err; return Qnil; @@ -1881,9 +1890,9 @@ } HDDEDATA CALLBACK -mswindows_dde_callback (UINT uType, UINT uFmt, HCONV hconv, +mswindows_dde_callback (UINT uType, UINT uFmt, HCONV UNUSED (hconv), HSZ hszTopic, HSZ hszItem, HDDEDATA hdata, - DWORD dwData1, DWORD dwData2) + DWORD UNUSED (dwData1), DWORD UNUSED (dwData2)) { switch (uType) { @@ -4054,8 +4063,8 @@ * Only returns non-Qnil for keys that don't generate WM_CHAR messages * or whose ASCII codes (like space) xemacs doesn't like. */ -Lisp_Object mswindows_key_to_emacs_keysym (int mswindows_key, int mods, - int extendedp) +Lisp_Object mswindows_key_to_emacs_keysym (int mswindows_key, + int UNUSED (mods), int extendedp) { if (extendedp) /* Keys not present on a 82 key keyboard */ { @@ -4269,7 +4278,7 @@ * Find the console that matches the supplied mswindows window handle */ Lisp_Object -mswindows_find_console (HWND hwnd) +mswindows_find_console (HWND UNUSED (hwnd)) { /* We only support one console */ return XCAR (Vconsole_list); @@ -4614,7 +4623,7 @@ } static void -emacs_mswindows_select_console (struct console *con) +emacs_mswindows_select_console (struct console *USED_IF_CYGWIN (con)) { #ifdef CYGWIN if (CONSOLE_MSWINDOWS_P (con)) @@ -4649,7 +4658,7 @@ } static void -emacs_mswindows_unselect_console (struct console *con) +emacs_mswindows_unselect_console (struct console *USED_IF_CYGWIN (con)) { #ifdef CYGWIN if (CONSOLE_MSWINDOWS_P (con)) @@ -4739,7 +4748,7 @@ static void emacs_mswindows_delete_io_streams (Lisp_Object instream, - Lisp_Object outstream, + Lisp_Object USED_IF_CYGWIN (outstream), Lisp_Object errstream, USID *in_usid, USID *err_usid) @@ -4765,7 +4774,7 @@ } static int -emacs_mswindows_current_event_timestamp (struct console *c) +emacs_mswindows_current_event_timestamp (struct console *UNUSED (c)) { return GetTickCount (); } @@ -4776,7 +4785,7 @@ */ void debug_process_finalization (Lisp_Process *p); void -debug_process_finalization (Lisp_Process *p) +debug_process_finalization (Lisp_Process *UNUSED (p)) { #if 0 /* #### */ Lisp_Object instr, outstr, errstr;
--- a/src/event-stream.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/event-stream.c Mon Sep 20 19:20:08 2004 +0000 @@ -2606,7 +2606,7 @@ } static int -command_event_p_cb (Lisp_Object ev, void *the_data) +command_event_p_cb (Lisp_Object ev, void *UNUSED (the_data)) { return command_event_p (ev); }
--- a/src/event-tty.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/event-tty.c Mon Sep 20 19:20:08 2004 +0000 @@ -184,25 +184,27 @@ } static void -emacs_tty_format_magic_event (Lisp_Event *emacs_event, Lisp_Object pstream) +emacs_tty_format_magic_event (Lisp_Event *UNUSED (emacs_event), + Lisp_Object UNUSED (pstream)) { /* Nothing to do currently */ } static int -emacs_tty_compare_magic_event (Lisp_Event *e1, Lisp_Event *e2) +emacs_tty_compare_magic_event (Lisp_Event *UNUSED (e1), + Lisp_Event *UNUSED (e2)) { return 1; } static Hashcode -emacs_tty_hash_magic_event (Lisp_Event *e) +emacs_tty_hash_magic_event (Lisp_Event *UNUSED (e)) { return 0; } static void -emacs_tty_handle_magic_event (Lisp_Event *emacs_event) +emacs_tty_handle_magic_event (Lisp_Event *UNUSED (emacs_event)) { /* Nothing to do currently */ }
--- a/src/events.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/events.c Mon Sep 20 19:20:08 2004 +0000 @@ -311,7 +311,8 @@ } static void -print_event (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_event (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { if (print_readably) printing_unreadable_object ("#<event>"); @@ -376,7 +377,7 @@ } static int -event_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) +event_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) { Lisp_Event *e1 = XEVENT (obj1); Lisp_Event *e2 = XEVENT (obj2);
--- a/src/extents.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/extents.c Mon Sep 20 19:20:08 2004 +0000 @@ -1702,7 +1702,8 @@ static void signal_single_extent_changed (EXTENT extent, Lisp_Object property, - Bytexpos old_start, Bytexpos old_end) + Bytexpos UNUSED (old_start), + Bytexpos UNUSED (old_end)) { EXTENT anc = extent_ancestor (extent); /* Redisplay checks */ @@ -3109,7 +3110,8 @@ } static void -print_extent_1 (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_extent_1 (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { EXTENT ext = XEXTENT (obj); EXTENT anc = extent_ancestor (ext); @@ -7236,7 +7238,8 @@ #ifdef MEMORY_USAGE_STATS int -compute_buffer_extent_usage (struct buffer *b, struct overhead_stats *ovstats) +compute_buffer_extent_usage (struct buffer *UNUSED (b), + struct overhead_stats *UNUSED (ovstats)) { /* #### not yet written */ return 0;
--- a/src/faces.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/faces.c Mon Sep 20 19:20:08 2004 +0000 @@ -97,7 +97,7 @@ } static void -print_face (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_face (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag)) { Lisp_Face *face = XFACE (obj); @@ -289,7 +289,7 @@ /************************************************************************/ static int -face_name_validate (Lisp_Object keyword, Lisp_Object value, +face_name_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, Error_Behavior errb) { if (ERRB_EQ (errb, ERROR_ME)) @@ -387,7 +387,7 @@ }; static int -add_face_to_list_mapper (Lisp_Object key, Lisp_Object value, +add_face_to_list_mapper (Lisp_Object UNUSED (key), Lisp_Object value, void *face_list_closure) { /* This function can GC */ @@ -427,7 +427,7 @@ static int -mark_face_as_clean_mapper (Lisp_Object key, Lisp_Object value, +mark_face_as_clean_mapper (Lisp_Object UNUSED (key), Lisp_Object value, void *flag_closure) { /* This function can GC */
--- a/src/file-coding.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/file-coding.c Mon Sep 20 19:20:08 2004 +0000 @@ -536,7 +536,7 @@ static void print_coding_system (Lisp_Object obj, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { Lisp_Coding_System *c = XCODING_SYSTEM (obj); if (print_readably) @@ -553,7 +553,7 @@ static void print_coding_system_in_print_method (Lisp_Object cs, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { write_fmt_string_lisp (printcharfun, "%s[", 1, XCODING_SYSTEM_NAME (cs)); print_coding_system_properties (cs, printcharfun); @@ -894,7 +894,7 @@ }; static int -add_coding_system_to_list_mapper (Lisp_Object key, Lisp_Object value, +add_coding_system_to_list_mapper (Lisp_Object key, Lisp_Object UNUSED (value), void *coding_system_list_closure) { /* This function can GC */ @@ -1695,7 +1695,7 @@ /* A maphash function, for removing dangling coding system aliases. */ static int -dangling_coding_system_alias_p (Lisp_Object alias, +dangling_coding_system_alias_p (Lisp_Object UNUSED (alias), Lisp_Object aliasee, void *dangling_aliases) { @@ -1729,7 +1729,7 @@ */ (alias, aliasee)) { - Lisp_Object real_coding_system, probe; + Lisp_Object probe; CHECK_SYMBOL (alias); @@ -1776,7 +1776,7 @@ aliasee = XCODING_SYSTEM_NAME (aliasee); /* Checks that aliasee names a coding-system */ - real_coding_system = Fget_coding_system (aliasee); + (void) Fget_coding_system (aliasee); /* Check for coding system alias loops */ if (EQ (alias, aliasee)) @@ -3006,8 +3006,8 @@ }; static void -no_conversion_detect (struct detection_state *st, const UExtbyte *src, - Bytecount n) +no_conversion_detect (struct detection_state *st, const UExtbyte *UNUSED (src), + Bytecount UNUSED (n)) { /* Hack until we get better handling of this stuff! */ DET_RESULT (st, no_conversion) = DET_SLIGHTLY_LIKELY; @@ -3056,7 +3056,8 @@ DEFINE_CODING_SYSTEM_TYPE_WITH_DATA (convert_eol); static void -convert_eol_print (Lisp_Object cs, Lisp_Object printcharfun, int escapeflag) +convert_eol_print (Lisp_Object cs, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { struct convert_eol_coding_system *data = XCODING_SYSTEM_TYPE_DATA (cs, convert_eol); @@ -3070,7 +3071,7 @@ } static enum source_sink_type -convert_eol_conversion_end_type (Lisp_Object codesys) +convert_eol_conversion_end_type (Lisp_Object UNUSED (codesys)) { return DECODES_CHARACTER_TO_CHARACTER; } @@ -4312,7 +4313,7 @@ DEFINE_CODING_SYSTEM_TYPE (internal); static Bytecount -internal_convert (struct coding_stream *str, const UExtbyte *src, +internal_convert (struct coding_stream *UNUSED (str), const UExtbyte *src, unsigned_char_dynarr *dst, Bytecount n) { Bytecount orign = n;
--- a/src/fileio.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/fileio.c Mon Sep 20 19:20:08 2004 +0000 @@ -1975,7 +1975,8 @@ } static Lisp_Object -internal_delete_file_1 (Lisp_Object ignore, Lisp_Object ignore2) +internal_delete_file_1 (Lisp_Object UNUSED (ignore), + Lisp_Object UNUSED (ignore2)) { return Qt; } @@ -3829,7 +3830,8 @@ } static Lisp_Object -auto_save_error (Lisp_Object condition_object, Lisp_Object ignored) +auto_save_error (Lisp_Object UNUSED (condition_object), + Lisp_Object UNUSED (ignored)) { /* This function can call lisp */ if (gc_in_progress) @@ -3849,7 +3851,7 @@ } static Lisp_Object -auto_save_1 (Lisp_Object ignored) +auto_save_1 (Lisp_Object UNUSED (ignored)) { /* This function can call lisp */ /* #### I think caller is protecting current_buffer? */ @@ -3883,7 +3885,8 @@ } static Lisp_Object -auto_save_expand_name_error (Lisp_Object condition_object, Lisp_Object ignored) +auto_save_expand_name_error (Lisp_Object condition_object, + Lisp_Object UNUSED (ignored)) { warn_when_safe_lispobj (Qfile, Qerror,
--- a/src/filemode.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/filemode.c Mon Sep 20 19:20:08 2004 +0000 @@ -150,7 +150,13 @@ according to the file mode BITS. */ static void -setst (unsigned short bits, char *chars) +setst ( +#if defined(S_ISUID) || defined(S_ISGID) || defined(S_ISVTX) + unsigned short bits, char *chars +#else + unsigned short UNUSED (bits), char *UNUSED (chars) +#endif + ) { #ifdef S_ISUID if (bits & S_ISUID)
--- a/src/floatfns.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/floatfns.c Mon Sep 20 19:20:08 2004 +0000 @@ -122,7 +122,14 @@ error using the given arguments. If bignums are available, range errors are never signaled. */ static Lisp_Object -float_to_int (double x, const char *name, Lisp_Object num, Lisp_Object num2) +float_to_int (double x, +#ifdef HAVE_BIGNUM + const char *UNUSED (name), Lisp_Object UNUSED (num), + Lisp_Object UNUSED (num2) +#else + const char *name, Lisp_Object num, Lisp_Object num2 +#endif + ) { #ifdef HAVE_BIGNUM bignum_set_double (scratch_bignum, x); @@ -166,19 +173,19 @@ static Lisp_Object -mark_float (Lisp_Object obj) +mark_float (Lisp_Object UNUSED (obj)) { return Qnil; } static int -float_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) +float_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) { return (extract_float (obj1) == extract_float (obj2)); } static Hashcode -float_hash (Lisp_Object obj, int depth) +float_hash (Lisp_Object obj, int UNUSED (depth)) { /* mod the value down to 32-bit range */ /* #### change for 64-bit machines */
--- a/src/fns.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/fns.c Mon Sep 20 19:20:08 2004 +0000 @@ -65,13 +65,14 @@ Lisp_Object safe_copy_tree (Lisp_Object arg, Lisp_Object vecp, int depth); static Lisp_Object -mark_bit_vector (Lisp_Object obj) +mark_bit_vector (Lisp_Object UNUSED (obj)) { return Qnil; } static void -print_bit_vector (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_bit_vector (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { Elemcount i; Lisp_Bit_Vector *v = XBIT_VECTOR (obj); @@ -94,7 +95,7 @@ } static int -bit_vector_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) +bit_vector_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) { Lisp_Bit_Vector *v1 = XBIT_VECTOR (obj1); Lisp_Bit_Vector *v2 = XBIT_VECTOR (obj2); @@ -106,7 +107,7 @@ } static Hashcode -bit_vector_hash (Lisp_Object obj, int depth) +bit_vector_hash (Lisp_Object obj, int UNUSED (depth)) { Lisp_Bit_Vector *v = XBIT_VECTOR (obj); return HASH2 (bit_vector_length (v),
--- a/src/frame-gtk.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/frame-gtk.c Mon Sep 20 19:20:08 2004 +0000 @@ -307,7 +307,7 @@ individual properties. */ static void -gtk_set_frame_text_value (struct frame *f, Ibyte *value, +gtk_set_frame_text_value (struct frame *UNUSED (f), Ibyte *value, void (*func) (gpointer, gchar *), gpointer arg) { @@ -642,7 +642,8 @@ } static gboolean -resize_event_cb (GtkWidget *w, GtkAllocation *allocation, gpointer user_data) +resize_event_cb (GtkWidget *UNUSED (w), GtkAllocation *allocation, + gpointer user_data) { struct frame *f = (struct frame *) user_data; @@ -660,7 +661,8 @@ } static gboolean -delete_event_cb (GtkWidget *w, GdkEvent *ev, gpointer user_data) +delete_event_cb (GtkWidget *UNUSED (w), GdkEvent *UNUSED (ev), + gpointer user_data) { struct frame *f = (struct frame *) user_data; Lisp_Object frame = wrap_frame (f); @@ -713,12 +715,12 @@ #define DRAG_SELECTION_DATA_ERROR "Error converting drag data to external format" static void -dragndrop_get_drag (GtkWidget *widget, - GdkDragContext *drag_context, +dragndrop_get_drag (GtkWidget *UNUSED (widget), + GdkDragContext *UNUSED (drag_context), GtkSelectionData *data, guint info, - guint time, - gpointer user_data) + guint UNUSED (time), + gpointer UNUSED (user_data)) { gtk_selection_data_set (data, GDK_SELECTION_TYPE_STRING, 8, DRAG_SELECTION_DATA_ERROR, @@ -993,7 +995,7 @@ static void gtk_init_frame_1 (struct frame *f, Lisp_Object props, - int frame_name_is_defaulted) + int UNUSED (frame_name_is_defaulted)) { /* This function can GC */ Lisp_Object initially_unmapped; @@ -1036,7 +1038,7 @@ } static void -gtk_init_frame_2 (struct frame *f, Lisp_Object props) +gtk_init_frame_2 (struct frame *f, Lisp_Object UNUSED (props)) { /* Set up the values of the widget/frame. A case could be made for putting this inside of the widget's initialize method. */
--- a/src/frame-msw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/frame-msw.c Mon Sep 20 19:20:08 2004 +0000 @@ -119,7 +119,7 @@ static void mswindows_init_frame_1 (struct frame *f, Lisp_Object props, - int frame_name_is_defaulted) + int UNUSED (frame_name_is_defaulted)) { Lisp_Object initially_unmapped; Lisp_Object name, height, width, popup, top, left; @@ -261,7 +261,7 @@ } static void -mswindows_init_frame_2 (struct frame *f, Lisp_Object props) +mswindows_init_frame_2 (struct frame *f, Lisp_Object UNUSED (props)) { if (NILP (Vmswindows_use_system_frame_size_defaults)) { @@ -286,8 +286,8 @@ } static void -mswindows_after_init_frame (struct frame *f, int first_on_device, - int first_on_console) +mswindows_after_init_frame (struct frame *UNUSED (f), + int UNUSED (first_on_device), int first_on_console) { /* Windows, unlike X, is very synchronous. After the initial frame is created, it will never be displayed, except for @@ -488,7 +488,8 @@ } static int -mswindows_get_mouse_position (struct device *d, Lisp_Object *frame, int *x, int *y) +mswindows_get_mouse_position (struct device *UNUSED (d), Lisp_Object *frame, + int *x, int *y) { POINT pt; HWND hwnd; @@ -575,7 +576,8 @@ } static int -mswindows_internal_frame_property_p (struct frame *f, Lisp_Object property) +mswindows_internal_frame_property_p (struct frame *UNUSED (f), + Lisp_Object property) { return EQ (property, Qleft) || EQ (property, Qtop); @@ -778,7 +780,8 @@ } static void -mswindows_update_frame_external_traits (struct frame *frm, Lisp_Object name) +mswindows_update_frame_external_traits (struct frame *UNUSED (frm), + Lisp_Object UNUSED (name)) { } @@ -835,8 +838,8 @@ } static void -msprinter_init_frame_1 (struct frame *f, Lisp_Object props, - int frame_name_is_defaulted) +msprinter_init_frame_1 (struct frame *f, Lisp_Object UNUSED (props), + int UNUSED (frame_name_is_defaulted)) { /* Make sure this is the only frame on device. Windows printer can handle only one job at a time. */ @@ -964,7 +967,7 @@ } static void -msprinter_mark_frame (struct frame *f) +msprinter_mark_frame (struct frame *UNUSED (f)) { } @@ -1000,7 +1003,8 @@ } static int -msprinter_internal_frame_property_p (struct frame *f, Lisp_Object property) +msprinter_internal_frame_property_p (struct frame *UNUSED (f), + Lisp_Object property) { return (EQ (Qleft_margin, property) || EQ (Qtop_margin, property) || EQ (Qright_margin, property) || EQ (Qbottom_margin, property)); @@ -1081,7 +1085,8 @@ } static void -msprinter_set_frame_size (struct frame *f, int width, int height) +msprinter_set_frame_size (struct frame *f, int UNUSED (width), + int UNUSED (height)) { /* We're absolutely unsizeable */ error_frame_unsizable (f);
--- a/src/frame-tty.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/frame-tty.c Mon Sep 20 19:20:08 2004 +0000 @@ -43,7 +43,7 @@ static void -tty_init_frame_1 (struct frame *f, Lisp_Object props, +tty_init_frame_1 (struct frame *f, Lisp_Object UNUSED (props), int frame_name_is_defaulted) { struct device *d = XDEVICE (FRAME_DEVICE (f)); @@ -79,7 +79,7 @@ } static void -tty_after_init_frame (struct frame *f, int first_on_device, +tty_after_init_frame (struct frame *f, int UNUSED (first_on_device), int first_on_console) { if (first_on_console) @@ -195,7 +195,7 @@ } static int -tty_internal_frame_property_p (struct frame *f, Lisp_Object property) +tty_internal_frame_property_p (struct frame *UNUSED (f), Lisp_Object property) { return EQ (property, Qframe_number); }
--- a/src/frame-x.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/frame-x.c Mon Sep 20 19:20:08 2004 +0000 @@ -583,7 +583,7 @@ } static int -x_internal_frame_property_p (struct frame *f, Lisp_Object property) +x_internal_frame_property_p (struct frame *UNUSED (f), Lisp_Object property) { return EQ (property, Qleft) || EQ (property, Qtop) @@ -1472,7 +1472,7 @@ before the user moves the mouse for the first time. */ static void -x_send_synthetic_mouse_event (struct frame *f) +x_send_synthetic_mouse_event (struct frame *UNUSED (f)) { /* #### write this function. */ } @@ -1759,7 +1759,8 @@ } static void -x_layout_widgets (Widget w, XtPointer client_data, XtPointer call_data) +x_layout_widgets (Widget UNUSED (w), XtPointer client_data, + XtPointer call_data) { struct frame *f = (struct frame *) client_data; EmacsManagerResizeStruct *emst = (EmacsManagerResizeStruct *) call_data; @@ -1799,7 +1800,8 @@ } static void -x_do_query_geometry (Widget w, XtPointer client_data, XtPointer call_data) +x_do_query_geometry (Widget UNUSED (w), XtPointer client_data, + XtPointer call_data) { struct frame *f = (struct frame *) client_data; EmacsManagerQueryGeometryStruct *emst = @@ -2135,7 +2137,7 @@ static void x_init_frame_1 (struct frame *f, Lisp_Object props, - int frame_name_is_defaulted) + int UNUSED (frame_name_is_defaulted)) { /* This function can GC */ Lisp_Object device = FRAME_DEVICE (f); @@ -2169,7 +2171,7 @@ } static void -x_init_frame_2 (struct frame *f, Lisp_Object props) +x_init_frame_2 (struct frame *f, Lisp_Object UNUSED (props)) { /* Set up the values of the widget/frame. A case could be made for putting this inside of the widget's initialize method. */
--- a/src/frame.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/frame.c Mon Sep 20 19:20:08 2004 +0000 @@ -234,7 +234,8 @@ } static void -print_frame (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_frame (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { struct frame *frm = XFRAME (obj); @@ -773,8 +774,8 @@ * changing which causes frame size adjustment */ void -frame_size_slipped (Lisp_Object specifier, struct frame *f, - Lisp_Object oldval) +frame_size_slipped (Lisp_Object UNUSED (specifier), struct frame *f, + Lisp_Object UNUSED (oldval)) { MARK_FRAME_SIZE_SLIPPED(f); } @@ -3527,8 +3528,8 @@ } static void -icon_glyph_changed (Lisp_Object glyph, Lisp_Object property, - Lisp_Object locale) +icon_glyph_changed (Lisp_Object UNUSED (glyph), Lisp_Object UNUSED (property), + Lisp_Object UNUSED (locale)) { MARK_ICON_CHANGED; }
--- a/src/free-hook.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/free-hook.c Mon Sep 20 19:20:08 2004 +0000 @@ -361,7 +361,7 @@ Actually free the storage held by the free() debug hook. A no-op if the free hook is disabled. */ - (arg)) + (UNUSED (arg))) { int count[2]; Lisp_Object lisp_count[2];
--- a/src/glyphs-eimage.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/glyphs-eimage.c Mon Sep 20 19:20:08 2004 +0000 @@ -118,7 +118,7 @@ static Lisp_Object jpeg_normalize (Lisp_Object inst, Lisp_Object console_type, - Lisp_Object dest_mask) + Lisp_Object UNUSED (dest_mask)) { return simple_image_type_normalize (inst, console_type, Qjpeg); } @@ -196,7 +196,7 @@ #else METHODDEF void #endif -our_init_source (j_decompress_ptr cinfo) +our_init_source (j_decompress_ptr UNUSED (cinfo)) { } @@ -247,7 +247,7 @@ #else METHODDEF void #endif -our_term_source (j_decompress_ptr cinfo) +our_term_source (j_decompress_ptr UNUSED (cinfo)) { } @@ -313,7 +313,8 @@ source code and from gif_instantiate() */ static void jpeg_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), int dest_mask, Lisp_Object domain) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); @@ -517,7 +518,7 @@ static Lisp_Object gif_normalize (Lisp_Object inst, Lisp_Object console_type, - Lisp_Object dest_mask) + Lisp_Object UNUSED (dest_mask)) { return simple_image_type_normalize (inst, console_type, Qgif); } @@ -577,7 +578,7 @@ } static int -gif_memory_close (VoidPtr data) +gif_memory_close (VoidPtr UNUSED (data)) { return 0; } @@ -600,7 +601,8 @@ static void gif_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), int dest_mask, Lisp_Object domain) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); @@ -763,7 +765,7 @@ static Lisp_Object png_normalize (Lisp_Object inst, Lisp_Object console_type, - Lisp_Object dest_mask) + Lisp_Object UNUSED (dest_mask)) { return simple_image_type_normalize (inst, console_type, Qpng); } @@ -809,14 +811,14 @@ static struct png_error_struct png_err_stct; static void -png_error_func (png_structp png_ptr, png_const_charp msg) +png_error_func (png_structp UNUSED (png_ptr), png_const_charp msg) { png_err_stct.err_str = msg; longjmp (png_err_stct.setjmp_buffer, 1); } static void -png_warning_func (png_structp png_ptr, png_const_charp msg) +png_warning_func (png_structp UNUSED (png_ptr), png_const_charp msg) { warn_when_safe (Qpng, Qinfo, "%s", msg); } @@ -849,7 +851,8 @@ static void png_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), int dest_mask, Lisp_Object domain) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); @@ -1053,7 +1056,7 @@ static Lisp_Object tiff_normalize (Lisp_Object inst, Lisp_Object console_type, - Lisp_Object dest_mask) + Lisp_Object UNUSED (dest_mask)) { return simple_image_type_normalize (inst, console_type, Qtiff); } @@ -1108,7 +1111,8 @@ } static size_t -tiff_memory_write (thandle_t data, tdata_t buf, tsize_t size) +tiff_memory_write (thandle_t UNUSED (data), tdata_t UNUSED (buf), + tsize_t UNUSED (size)) { abort(); return 0; @@ -1143,19 +1147,21 @@ } static int -tiff_memory_close (thandle_t data) +tiff_memory_close (thandle_t UNUSED (data)) { return 0; } static int -tiff_map_noop (thandle_t data, tdata_t* pbase, toff_t* psize) +tiff_map_noop (thandle_t UNUSED (data), tdata_t* UNUSED (pbase), + toff_t* UNUSED (psize)) { return 0; } static void -tiff_unmap_noop (thandle_t data, tdata_t pbase, toff_t psize) +tiff_unmap_noop (thandle_t UNUSED (data), tdata_t UNUSED (pbase), + toff_t UNUSED (psize)) { return; } @@ -1184,7 +1190,7 @@ static struct tiff_error_struct tiff_err_data; static void -tiff_error_func (const char *module, const char *fmt, ...) +tiff_error_func (const char *UNUSED (module), const char *fmt, ...) { va_list vargs; @@ -1223,7 +1229,8 @@ static void tiff_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), int dest_mask, Lisp_Object domain) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
--- a/src/glyphs-gtk.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/glyphs-gtk.c Mon Sep 20 19:20:08 2004 +0000 @@ -350,7 +350,7 @@ static void gtk_print_image_instance (struct Lisp_Image_Instance *p, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { switch (IMAGE_INSTANCE_TYPE (p)) { @@ -460,7 +460,7 @@ static int gtk_image_instance_equal (struct Lisp_Image_Instance *p1, - struct Lisp_Image_Instance *p2, int depth) + struct Lisp_Image_Instance *p2, int UNUSED (depth)) { switch (IMAGE_INSTANCE_TYPE (p1)) { @@ -483,7 +483,7 @@ } static unsigned long -gtk_image_instance_hash (struct Lisp_Image_Instance *p, int depth) +gtk_image_instance_hash (struct Lisp_Image_Instance *p, int UNUSED (depth)) { switch (IMAGE_INSTANCE_TYPE (p)) { @@ -599,8 +599,8 @@ message. */ static void -check_pointer_sizes (unsigned int width, unsigned int height, - Lisp_Object instantiator) +check_pointer_sizes (unsigned int UNUSED (width), unsigned int UNUSED (height), + Lisp_Object UNUSED (instantiator)) { /* #### BILL!!! There is no way to call XQueryBestCursor from Gdk! */ #if 0 @@ -649,8 +649,9 @@ } static void -maybe_recolor_cursor (Lisp_Object image_instance, Lisp_Object foreground, - Lisp_Object background) +maybe_recolor_cursor (Lisp_Object UNUSED (image_instance), + Lisp_Object UNUSED (foreground), + Lisp_Object UNUSED (background)) { #if 0 /* #### BILL!!! */ @@ -830,7 +831,7 @@ unsigned char *eimage, int dest_mask, Lisp_Object instantiator, - Lisp_Object domain) + Lisp_Object UNUSED (domain)) { Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); GdkColormap *cmap = DEVICE_GTK_COLORMAP (XDEVICE(device)); @@ -892,7 +893,7 @@ Lisp_Object pointer_bg, int dest_mask, GdkPixmap *mask, - Lisp_Object mask_filename) + Lisp_Object UNUSED (mask_filename)) { Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); Lisp_Object foreground = find_keyword_in_vector (instantiator, Q_foreground); @@ -1048,7 +1049,7 @@ static void gtk_xbm_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + int dest_mask, Lisp_Object UNUSED (domain)) { Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); const char *gcc_go_home; @@ -1335,8 +1336,8 @@ static void gtk_xface_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + Lisp_Object pointer_fg, Lisp_Object pointer_bg, + int dest_mask, Lisp_Object UNUSED (domain)) { Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); int i, stattis; @@ -1455,8 +1456,9 @@ static void gtk_resource_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), + int UNUSED (dest_mask), Lisp_Object UNUSED (domain)) { struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); GdkCursor *c = NULL; @@ -1537,7 +1539,7 @@ static Lisp_Object autodetect_normalize (Lisp_Object instantiator, Lisp_Object console_type, - Lisp_Object dest_mask) + Lisp_Object UNUSED (dest_mask)) { Lisp_Object file = find_keyword_in_vector (instantiator, Q_data); Lisp_Object filename = Qnil; @@ -1691,7 +1693,7 @@ static void font_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + int dest_mask, Lisp_Object UNUSED (domain)) { /* This function can GC */ Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); @@ -1876,7 +1878,7 @@ static void cursor_font_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + int dest_mask, Lisp_Object UNUSED (domain)) { /* This function can GC */ Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); @@ -2132,9 +2134,11 @@ /* instantiate and gtk type subwindow */ static void -gtk_subwindow_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) +gtk_subwindow_instantiate (Lisp_Object image_instance, + Lisp_Object UNUSED (instantiator), + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), + int UNUSED (dest_mask), Lisp_Object UNUSED (domain)) { /* This function can GC */ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); @@ -2285,7 +2289,7 @@ static void gtk_widget_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + int UNUSED (dest_mask), Lisp_Object domain) { call_with_suspended_errors ((lisp_fn_t) gtk_widget_instantiate_1, Qnil, Qimage, @@ -2298,7 +2302,7 @@ /* get properties of a control */ static Lisp_Object -gtk_widget_property (Lisp_Object image_instance, Lisp_Object prop) +gtk_widget_property (Lisp_Object UNUSED (image_instance), Lisp_Object prop) { /* Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); */ @@ -2348,7 +2352,8 @@ static void gtk_widget_query_geometry (Lisp_Object image_instance, int* width, int* height, - enum image_instance_geometry disp, Lisp_Object domain) + enum image_instance_geometry UNUSED (disp), + Lisp_Object UNUSED (domain)) { Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance); @@ -2463,7 +2468,7 @@ static void gtk_add_tab_item(Lisp_Object image_instance, GtkNotebook* nb, Lisp_Object item, - Lisp_Object domain, int i) + Lisp_Object domain, int UNUSED (i)) { Lisp_Object name; int hash_id = 0; @@ -2515,8 +2520,8 @@ /* Signal handler for the switch-page signal. */ static void gtk_tab_control_callback(GtkNotebook *notebook, GtkNotebookPage *page, - gint page_num, - gpointer user_data) + gint UNUSED (page_num), + gpointer UNUSED (user_data)) { /* This callback is called for every selection, not just user selection.
--- a/src/glyphs-msw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/glyphs-msw.c Mon Sep 20 19:20:08 2004 +0000 @@ -939,7 +939,8 @@ static void mswindows_xpm_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), int dest_mask, Lisp_Object domain) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); @@ -1018,7 +1019,7 @@ static Lisp_Object bmp_normalize (Lisp_Object inst, Lisp_Object console_type, - Lisp_Object dest_mask) + Lisp_Object UNUSED (dest_mask)) { return simple_image_type_normalize (inst, console_type, Qbmp); } @@ -1031,8 +1032,9 @@ static void bmp_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), + int dest_mask, Lisp_Object UNUSED (domain)) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); @@ -1198,8 +1200,9 @@ static void mswindows_resource_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), + int dest_mask, Lisp_Object UNUSED (domain)) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); int type = 0; @@ -1431,7 +1434,7 @@ Lisp_Object pointer_bg, int dest_mask, HBITMAP mask, - Lisp_Object mask_filename) + Lisp_Object UNUSED (mask_filename)) { Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); Lisp_Object foreground = find_keyword_in_vector (instantiator, Q_foreground); @@ -1588,7 +1591,7 @@ mswindows_xbm_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + int dest_mask, Lisp_Object UNUSED (domain)) { Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); const UChar_Binary *ext_data; @@ -1629,7 +1632,7 @@ mswindows_xface_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + int dest_mask, Lisp_Object UNUSED (domain)) { Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); int i, stattis; @@ -1699,7 +1702,7 @@ static void mswindows_print_image_instance (Lisp_Image_Instance *p, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { switch (IMAGE_INSTANCE_TYPE (p)) { @@ -1797,7 +1800,13 @@ /************************************************************************/ static Lisp_Object -charset_of_text (Lisp_Object text) +charset_of_text (Lisp_Object +#ifdef MULE + text +#else + UNUSED (text) +#endif + ) { #ifdef MULE Ibyte *p; @@ -2085,10 +2094,10 @@ static void mswindows_subwindow_instantiate (Lisp_Object image_instance, - Lisp_Object instantiator, - Lisp_Object pointer_fg, - Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + Lisp_Object UNUSED (instantiator), + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), + int UNUSED (dest_mask), Lisp_Object domain) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); @@ -2143,7 +2152,7 @@ static int mswindows_image_instance_equal (Lisp_Image_Instance *p1, - Lisp_Image_Instance *p2, int depth) + Lisp_Image_Instance *p2, int UNUSED (depth)) { switch (IMAGE_INSTANCE_TYPE (p1)) { @@ -2163,7 +2172,7 @@ } static Hashcode -mswindows_image_instance_hash (Lisp_Image_Instance *p, int depth) +mswindows_image_instance_hash (Lisp_Image_Instance *p, int UNUSED (depth)) { switch (IMAGE_INSTANCE_TYPE (p)) { @@ -2209,9 +2218,10 @@ /************************************************************************/ static void mswindows_widget_instantiate (Lisp_Object image_instance, - Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain, + Lisp_Object UNUSED (instantiator), + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), + int UNUSED (dest_mask), Lisp_Object domain, const CIbyte *class_, int flags, int exflags) { /* this function can call lisp */
--- a/src/glyphs-shared.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/glyphs-shared.c Mon Sep 20 19:20:08 2004 +0000 @@ -63,7 +63,7 @@ Lisp_Object shared_resource_normalize (Lisp_Object inst, Lisp_Object console_type, - Lisp_Object dest_mask, Lisp_Object tag) + Lisp_Object UNUSED (dest_mask), Lisp_Object tag) { /* This function can call lisp */ Lisp_Object file = Qnil;
--- a/src/glyphs-widget.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/glyphs-widget.c Mon Sep 20 19:20:08 2004 +0000 @@ -149,7 +149,7 @@ } static void -check_valid_anything (Lisp_Object data) +check_valid_anything (Lisp_Object UNUSED (data)) { } @@ -659,8 +659,8 @@ /* we need to convert things like glyphs to images, eval expressions etc.*/ static Lisp_Object -widget_normalize (Lisp_Object inst, Lisp_Object console_type, - Lisp_Object dest_mask) +widget_normalize (Lisp_Object inst, Lisp_Object UNUSED (console_type), + Lisp_Object UNUSED (dest_mask)) { /* This function can call lisp */ Lisp_Object glyph = find_keyword_in_vector (inst, Q_image); @@ -870,8 +870,13 @@ } static void -widget_post_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object domain) +widget_post_instantiate (Lisp_Object UNUSED (image_instance), +#ifdef DEBUG_WIDGETS + Lisp_Object instantiator, +#else + Lisp_Object UNUSED (instantiator), +#endif + Lisp_Object UNUSED (domain)) { #ifdef DEBUG_WIDGETS debug_widget_instances++; @@ -886,7 +891,8 @@ static void button_query_geometry (Lisp_Object image_instance, int* width, int* height, - enum image_instance_geometry disp, Lisp_Object domain) + enum image_instance_geometry UNUSED (disp), + Lisp_Object domain) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); int w, h; @@ -911,8 +917,9 @@ /* Get the geometry of an edit field. */ static void edit_field_query_geometry (Lisp_Object image_instance, - int* width, int* height, - enum image_instance_geometry disp, Lisp_Object domain) + int* width, int* height, + enum image_instance_geometry UNUSED (disp), + Lisp_Object domain) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); int w, h; @@ -930,7 +937,8 @@ static void tree_view_query_geometry (Lisp_Object image_instance, int* width, int* height, - enum image_instance_geometry disp, Lisp_Object domain) + enum image_instance_geometry UNUSED (disp), + Lisp_Object domain) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); Lisp_Object items = IMAGE_INSTANCE_WIDGET_ITEMS (ii); @@ -958,7 +966,8 @@ static void tab_control_query_geometry (Lisp_Object image_instance, int* width, int* height, - enum image_instance_geometry disp, Lisp_Object domain) + enum image_instance_geometry UNUSED (disp), + Lisp_Object domain) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); Lisp_Object items = XCDR (IMAGE_INSTANCE_WIDGET_ITEMS (ii)); @@ -1232,8 +1241,9 @@ } static void -layout_post_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object domain) +layout_post_instantiate (Lisp_Object UNUSED (image_instance), + Lisp_Object UNUSED (instantiator), + Lisp_Object UNUSED (domain)) { } @@ -1310,7 +1320,7 @@ static void layout_query_geometry (Lisp_Object image_instance, int* width, int* height, enum image_instance_geometry disp, - Lisp_Object domain) + Lisp_Object UNUSED (domain)) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); Lisp_Object items = IMAGE_INSTANCE_LAYOUT_CHILDREN (ii), rest; @@ -1419,8 +1429,8 @@ int layout_layout (Lisp_Object image_instance, - int width, int height, int xoffset, int yoffset, - Lisp_Object domain) + int width, int height, int UNUSED (xoffset), int yoffset, + Lisp_Object UNUSED (domain)) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); Lisp_Object rest; @@ -1636,7 +1646,7 @@ Logical widget units do not take into account adjusments made for layout borders, so this adjusment is approximated. */ - (width, face, domain)) + (width, UNUSED (face), domain)) { int w, neww, charwidth; int border_width = DEFAULT_WIDGET_BORDER_WIDTH; @@ -1674,7 +1684,7 @@ Since frame sizes are measured in characters, this function allows you to do appropriate conversion between logical units and characters. */ - (height, face, domain)) + (height, UNUSED (face), domain)) { int h, newh, charheight;
--- a/src/glyphs-x.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/glyphs-x.c Mon Sep 20 19:20:08 2004 +0000 @@ -356,7 +356,7 @@ static void x_print_image_instance (Lisp_Image_Instance *p, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { switch (IMAGE_INSTANCE_TYPE (p)) { @@ -476,7 +476,7 @@ static int x_image_instance_equal (Lisp_Image_Instance *p1, - Lisp_Image_Instance *p2, int depth) + Lisp_Image_Instance *p2, int UNUSED (depth)) { switch (IMAGE_INSTANCE_TYPE (p1)) { @@ -495,7 +495,7 @@ } static Hashcode -x_image_instance_hash (Lisp_Image_Instance *p, int depth) +x_image_instance_hash (Lisp_Image_Instance *p, int UNUSED (depth)) { switch (IMAGE_INSTANCE_TYPE (p)) { @@ -846,7 +846,7 @@ UChar_Binary *eimage, int dest_mask, Lisp_Object instantiator, - Lisp_Object domain) + Lisp_Object UNUSED (domain)) { Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); Colormap cmap = DEVICE_X_COLORMAP (XDEVICE(device)); @@ -914,7 +914,7 @@ Lisp_Object pointer_bg, int dest_mask, Pixmap mask, - Lisp_Object mask_filename) + Lisp_Object UNUSED (mask_filename)) { Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); Lisp_Object foreground = find_keyword_in_vector (instantiator, Q_foreground); @@ -1074,7 +1074,7 @@ static void x_xbm_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + int dest_mask, Lisp_Object UNUSED (domain)) { Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); Char_Binary *ext_data; @@ -1558,7 +1558,7 @@ static void x_xface_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + int dest_mask, Lisp_Object UNUSED (domain)) { Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); int i, stattis; @@ -1635,7 +1635,7 @@ static Lisp_Object autodetect_normalize (Lisp_Object instantiator, Lisp_Object console_type, - Lisp_Object dest_mask) + Lisp_Object UNUSED (dest_mask)) { Lisp_Object file = find_keyword_in_vector (instantiator, Q_data); Lisp_Object filename = Qnil; @@ -1796,7 +1796,7 @@ static int XLoadFont_got_error; static int -XLoadFont_error_handler (Display *dpy, XErrorEvent *xerror) +XLoadFont_error_handler (Display *UNUSED (dpy), XErrorEvent *UNUSED (xerror)) { XLoadFont_got_error = 1; return 0; @@ -1829,7 +1829,7 @@ static void font_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + int dest_mask, Lisp_Object UNUSED (domain)) { /* This function can GC */ Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); @@ -1927,7 +1927,7 @@ static void cursor_font_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + int dest_mask, Lisp_Object UNUSED (domain)) { /* This function can GC */ Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); @@ -2205,9 +2205,11 @@ /* instantiate and x type subwindow */ static void -x_subwindow_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) +x_subwindow_instantiate (Lisp_Object image_instance, + Lisp_Object UNUSED (instantiator), + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), + int UNUSED (dest_mask), Lisp_Object domain) { /* This function can GC */ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); @@ -2374,9 +2376,11 @@ } static void -x_widget_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain, +x_widget_instantiate (Lisp_Object image_instance, + Lisp_Object UNUSED (instantiator), + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), + int UNUSED (dest_mask), Lisp_Object domain, const char* type, widget_value* wv) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
--- a/src/glyphs.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/glyphs.c Mon Sep 20 19:20:08 2004 +0000 @@ -638,7 +638,7 @@ #ifdef ERROR_CHECK_GLYPHS static int -check_instance_cache_mapper (Lisp_Object key, Lisp_Object value, +check_instance_cache_mapper (Lisp_Object UNUSED (key), Lisp_Object value, void *flag_closure) { /* This function can GC */ @@ -2247,8 +2247,9 @@ static void nothing_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), + int dest_mask, Lisp_Object UNUSED (domain)) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); @@ -2274,8 +2275,8 @@ } static Lisp_Object -inherit_normalize (Lisp_Object inst, Lisp_Object console_type, - Lisp_Object dest_mask) +inherit_normalize (Lisp_Object inst, Lisp_Object UNUSED (console_type), + Lisp_Object UNUSED (dest_mask)) { Lisp_Object face; @@ -2293,9 +2294,11 @@ } static void -inherit_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask, Lisp_Object domain) +inherit_instantiate (Lisp_Object UNUSED (image_instance), + Lisp_Object UNUSED (instantiator), + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), + int UNUSED (dest_mask), Lisp_Object UNUSED (domain)) { /* handled specially in image_instantiate */ abort (); @@ -2321,7 +2324,8 @@ /* Called from autodetect_instantiate() */ void string_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), int dest_mask, Lisp_Object domain) { Lisp_Object string = find_keyword_in_vector (instantiator, Q_data); @@ -2446,7 +2450,8 @@ static void text_query_geometry (Lisp_Object image_instance, int* width, int* height, - enum image_instance_geometry disp, Lisp_Object domain) + enum image_instance_geometry UNUSED (disp), + Lisp_Object domain) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); int descent = 0; @@ -2751,7 +2756,7 @@ static Lisp_Object xbm_normalize (Lisp_Object inst, Lisp_Object console_type, - Lisp_Object dest_mask) + Lisp_Object UNUSED (dest_mask)) { Lisp_Object file = Qnil, mask_file = Qnil; struct gcpro gcpro1, gcpro2, gcpro3; @@ -2835,7 +2840,7 @@ static Lisp_Object xface_normalize (Lisp_Object inst, Lisp_Object console_type, - Lisp_Object dest_mask) + Lisp_Object UNUSED (dest_mask)) { /* This function can call lisp */ Lisp_Object file = Qnil, mask_file = Qnil; @@ -3052,7 +3057,7 @@ static Lisp_Object xpm_normalize (Lisp_Object inst, Lisp_Object console_type, - Lisp_Object dest_mask) + Lisp_Object UNUSED (dest_mask)) { Lisp_Object file = Qnil; Lisp_Object color_symbols; @@ -3212,7 +3217,7 @@ displayed in the given domain. */ static Lisp_Object -image_instantiate (Lisp_Object specifier, Lisp_Object matchspec, +image_instantiate (Lisp_Object specifier, Lisp_Object UNUSED (matchspec), Lisp_Object domain, Lisp_Object instantiator, Lisp_Object depth) { @@ -3506,7 +3511,7 @@ } static Lisp_Object -image_going_to_add (Lisp_Object specifier, Lisp_Object locale, +image_going_to_add (Lisp_Object specifier, Lisp_Object UNUSED (locale), Lisp_Object tag_set, Lisp_Object instantiator) { Lisp_Object possible_console_types = Qnil; @@ -3652,7 +3657,8 @@ } static void -print_glyph (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_glyph (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { Lisp_Glyph *glyph = XGLYPH (obj); @@ -4184,7 +4190,7 @@ } Lisp_Object -glyph_face (Lisp_Object glyph, Lisp_Object domain) +glyph_face (Lisp_Object glyph, Lisp_Object UNUSED (domain)) { /* #### Domain parameter not currently used but it will be */ return GLYPHP (glyph) ? GLYPH_FACE (XGLYPH (glyph)) : Qnil; @@ -4452,8 +4458,8 @@ system windows before deleting XEmacs windows, and hence subwindows. */ int -unmap_subwindow_instance_cache_mapper (Lisp_Object key, Lisp_Object value, - void* finalize) +unmap_subwindow_instance_cache_mapper (Lisp_Object UNUSED (key), + Lisp_Object value, void* finalize) { /* value can be nil; we cache failures as well as successes */ if (!NILP (value)) @@ -4784,7 +4790,6 @@ struct display_glyph_area *dga) { Lisp_Image_Instance* ii = XIMAGE_INSTANCE (subwindow); - struct frame* f; ERROR_CHECK_IMAGE_INSTANCE (subwindow); @@ -4797,7 +4802,8 @@ IMAGE_INSTANCE_SUBWINDOW_ID (ii), dga->width, dga->height, x, y); #endif - f = XFRAME (IMAGE_INSTANCE_FRAME (ii)); + /* Error check by side effect */ + (void) XFRAME (IMAGE_INSTANCE_FRAME (ii)); IMAGE_INSTANCE_DISPLAY_X (ii) = x; IMAGE_INSTANCE_DISPLAY_Y (ii) = y; IMAGE_INSTANCE_DISPLAY_WIDTH (ii) = dga->width; @@ -4823,7 +4829,8 @@ /* Partially instantiate a subwindow. */ void subwindow_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, - Lisp_Object pointer_fg, Lisp_Object pointer_bg, + Lisp_Object UNUSED (pointer_fg), + Lisp_Object UNUSED (pointer_bg), int dest_mask, Lisp_Object domain) { Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); @@ -4864,9 +4871,10 @@ /* This is just a backup in case no-one has assigned a suitable geometry. #### It should really query the enclose window for geometry. */ static void -subwindow_query_geometry (Lisp_Object image_instance, int* width, - int* height, enum image_instance_geometry disp, - Lisp_Object domain) +subwindow_query_geometry (Lisp_Object UNUSED (image_instance), + int* width, int* height, + enum image_instance_geometry UNUSED (disp), + Lisp_Object UNUSED (domain)) { if (width) *width = 20; if (height) *height = 20;
--- a/src/gpmevent.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/gpmevent.c Mon Sep 20 19:20:08 2004 +0000 @@ -108,7 +108,7 @@ Run GPM_GetEvent(). This function is the process handler for the GPM connection. */ - (process, string)) + (process, UNUSED (string))) { Gpm_Event ev; int modifiers = 0; @@ -206,8 +206,8 @@ #ifdef TIOCLINUX static Lisp_Object -tty_get_foreign_selection (Lisp_Object selection_symbol, - Lisp_Object target_type) +tty_get_foreign_selection (Lisp_Object UNUSED (selection_symbol), + Lisp_Object UNUSED (target_type)) { /* This function can GC */ struct device *d = decode_device (Qnil); @@ -300,7 +300,8 @@ } static Lisp_Object -tty_selection_exists_p (Lisp_Object selection, Lisp_Object selection_type) +tty_selection_exists_p (Lisp_Object UNUSED (selection), + Lisp_Object UNUSED (selection_type)) { return (Qt); } @@ -357,7 +358,8 @@ } static void -tty_set_mouse_position (struct window *w, int x, int y) +tty_set_mouse_position (struct window *UNUSED (w), int UNUSED (x), + int UNUSED (y)) { /* #### I couldn't find any GPM functions that set the mouse position.
--- a/src/gtk-xemacs.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/gtk-xemacs.c Mon Sep 20 19:20:08 2004 +0000 @@ -413,7 +413,7 @@ } Lisp_Object -xemacs_gtk_convert_color(GdkColor *c, GtkWidget *w) +xemacs_gtk_convert_color(GdkColor *c, GtkWidget *UNUSED (w)) { char color_buf[255];
--- a/src/gui-msw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/gui-msw.c Mon Sep 20 19:20:08 2004 +0000 @@ -42,7 +42,8 @@ * command if we return nil */ Lisp_Object -mswindows_handle_gui_wm_command (struct frame *f, HWND ctrl, LPARAM id) +mswindows_handle_gui_wm_command (struct frame *f, HWND UNUSED (ctrl), + LPARAM id) { /* Try to map the command id through the proper hash table */ Lisp_Object callback, callback_ex, image_instance, frame, event;
--- a/src/gui-x.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/gui-x.c Mon Sep 20 19:20:08 2004 +0000 @@ -224,7 +224,7 @@ */ void -popup_selection_callback (Widget widget, LWLIB_ID ignored_id, +popup_selection_callback (Widget widget, LWLIB_ID UNUSED (id), XtPointer client_data) { Lisp_Object data, image_instance, callback, callback_ex; @@ -505,13 +505,13 @@ if (NILP (pgui->style)) { Ibyte *intname; - Bytecount intlen; + Bytecount unused_intlen; /* If the callback is nil, treat this item like unselectable text. This way, dashes will show up as a separator. */ if (!wv->enabled) wv->type = BUTTON_TYPE; TO_INTERNAL_FORMAT (C_STRING, wv->name, - ALLOCA, (intname, intlen), + ALLOCA, (intname, unused_intlen), Qlwlib_encoding); if (separator_string_p (intname)) {
--- a/src/gui.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/gui.c Mon Sep 20 19:20:08 2004 +0000 @@ -688,7 +688,8 @@ } static void -print_gui_item (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_gui_item (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { Lisp_Gui_Item *g = XGUI_ITEM (obj); @@ -804,7 +805,7 @@ } static void -finalize_gui_item (void *header, int for_disksave) +finalize_gui_item (void *UNUSED (header), int UNUSED (for_disksave)) { }
--- a/src/gutter.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/gutter.c Mon Sep 20 19:20:08 2004 +0000 @@ -552,7 +552,8 @@ knows exactly what extents have changed. */ void gutter_extent_signal_changed_region_maybe (Lisp_Object obj, - Charbpos start, Charbpos end) + Charbpos UNUSED (start), + Charbpos UNUSED (end)) { /* #### Start and end are currently ignored but could be used by a more optimal gutter redisplay. We currently loop over all frames @@ -832,7 +833,8 @@ DEFINE_SPECIFIER_TYPE (gutter); static void -gutter_after_change (Lisp_Object specifier, Lisp_Object locale) +gutter_after_change (Lisp_Object UNUSED (specifier), + Lisp_Object UNUSED (locale)) { MARK_GUTTER_CHANGED; } @@ -948,8 +950,9 @@ } static void -default_gutter_specs_changed (Lisp_Object specifier, struct window *w, - Lisp_Object oldval) +default_gutter_specs_changed (Lisp_Object UNUSED (specifier), + struct window *UNUSED (w), + Lisp_Object UNUSED (oldval)) { recompute_overlaying_specifier (Vgutter); } @@ -994,24 +997,25 @@ } static void -default_gutter_size_changed_in_window (Lisp_Object specifier, struct window *w, - Lisp_Object oldval) +default_gutter_size_changed_in_window (Lisp_Object UNUSED (specifier), + struct window *UNUSED (w), + Lisp_Object UNUSED (oldval)) { recompute_overlaying_specifier (Vgutter_size); } static void -default_gutter_border_width_changed_in_window (Lisp_Object specifier, - struct window *w, - Lisp_Object oldval) +default_gutter_border_width_changed_in_window (Lisp_Object UNUSED (specifier), + struct window *UNUSED (w), + Lisp_Object UNUSED (oldval)) { recompute_overlaying_specifier (Vgutter_border_width); } static void -default_gutter_visible_p_changed_in_window (Lisp_Object specifier, - struct window *w, - Lisp_Object oldval) +default_gutter_visible_p_changed_in_window (Lisp_Object UNUSED (specifier), + struct window *UNUSED (w), + Lisp_Object UNUSED (oldval)) { recompute_overlaying_specifier (Vgutter_visible_p); /* Need to reconstruct the gutter specifier as it is affected by the
--- a/src/hpplay.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/hpplay.c Mon Sep 20 19:20:08 2004 +0000 @@ -92,7 +92,7 @@ /* Playing */ void -play_bucket_internal( Audio *audio, SBucket *pSBucket, long volume) +play_bucket_internal( Audio *audio, SBucket *pSBucket, long UNUSED (volume)) { SBPlayParams playParams; AGainEntry gainEntry; @@ -186,7 +186,7 @@ int -play_sound_data (UChar_Binary * data, int length, int volume) +play_sound_data (UChar_Binary * data, int UNUSED (length), int volume) { SBucket *pSBucket; Audio *audio;
--- a/src/input-method-motif.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/input-method-motif.c Mon Sep 20 19:20:08 2004 +0000 @@ -40,14 +40,15 @@ /* Create X input method for device */ void -XIM_init_device (struct device *d) +XIM_init_device (struct device *UNUSED (d)) { /* Nothing to do */ } /* Callback for the deleting frame. */ static void -XIM_delete_frame (Widget w, XtPointer client_data, XtPointer call_data) +XIM_delete_frame (Widget UNUSED (w), XtPointer client_data, + XtPointer UNUSED (call_data)) { XmImUnregister ((Widget) client_data); } @@ -115,7 +116,7 @@ } void -XIM_SetGeometry (struct frame *f) +XIM_SetGeometry (struct frame *UNUSED (f)) { }
--- a/src/input-method-xlib.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/input-method-xlib.c Mon Sep 20 19:20:08 2004 +0000 @@ -137,7 +137,8 @@ /* Called from when XIM is destroying. Clear all the XIC when the XIM was destroying... */ static void -IMDestroyCallback (XIM im, XPointer client_data, XPointer call_data) +IMDestroyCallback (XIM UNUSED (im), XPointer client_data, + XPointer UNUSED (call_data)) { struct device *d = (struct device *)client_data; Lisp_Object tail; @@ -160,7 +161,8 @@ /* This is registered in XIM_init_device (when DEVICE is initializing). This activates XIM when XIM becomes available. */ static void -IMInstantiateCallback (Display *dpy, XPointer client_data, XPointer call_data) +IMInstantiateCallback (Display *dpy, XPointer client_data, + XPointer UNUSED (call_data)) { struct device *d = (struct device *)client_data; XIM xim; @@ -243,7 +245,8 @@ /* Callback for the deleting frame. */ static void -XIM_delete_frame (Widget w, XtPointer client_data, XtPointer call_data) +XIM_delete_frame (Widget UNUSED (w), XtPointer client_data, + XtPointer UNUSED (call_data)) { struct frame *f = (struct frame *) client_data; struct device *d = XDEVICE (FRAME_DEVICE (f)); @@ -686,7 +689,7 @@ XtAppContext app, XrmValuePtr toVal, XtPointer converter_data, - XrmValuePtr args, + XrmValuePtr UNUSED (args), Cardinal *num_args) { #ifdef DEBUG_XIM
--- a/src/intl-win32.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/intl-win32.c Mon Sep 20 19:20:08 2004 +0000 @@ -53,6 +53,12 @@ # define NO_EXT_MULTIBYTE_FEATURES #endif +#ifdef MULE +#define USED_IF_MULE(decl) decl +#else +#define USED_IF_MULE(decl) UNUSED (decl) +#endif + Lisp_Object Qmswindows_multibyte, Qmswindows_multibyte_to_unicode; Lisp_Object Qmswindows_tstr, Qmswindows_unicode; Lisp_Object Qmswindows_multibyte_system_default; @@ -1604,7 +1610,7 @@ #else /* not MULE */ int -mswindows_locale_to_code_page (LCID lcid) +mswindows_locale_to_code_page (LCID UNUSED (lcid)) { return CP_ACP; } @@ -1745,7 +1751,7 @@ } static Lisp_Object -lcid_to_locale_mule_or_no (LCID lcid) +lcid_to_locale_mule_or_no (LCID USED_IF_MULE (lcid)) { #ifdef MULE return lcid_to_locale (lcid); @@ -1755,7 +1761,7 @@ } static int -determine_code_page (Lisp_Object codesys) +determine_code_page (Lisp_Object USED_IF_MULE (codesys)) { #ifdef MULE LCID locale; @@ -1907,8 +1913,8 @@ } static void -mswindows_multibyte_to_unicode_print (Lisp_Object cs, - Lisp_Object printcharfun, int escapeflag) +mswindows_multibyte_to_unicode_print (Lisp_Object cs, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { struct mswindows_multibyte_to_unicode_coding_system *data = XCODING_SYSTEM_TYPE_DATA (cs, mswindows_multibyte_to_unicode); @@ -2073,7 +2079,7 @@ } static enum source_sink_type -mswindows_multibyte_to_unicode_conversion_end_type (Lisp_Object codesys) +mswindows_multibyte_to_unicode_conversion_end_type (Lisp_Object UNUSED (codesys)) { return DECODES_BYTE_TO_BYTE; } @@ -2106,9 +2112,9 @@ DEFINE_CODING_SYSTEM_TYPE_WITH_DATA (mswindows_multibyte); static Bytecount -mswindows_multibyte_convert (struct coding_stream *str, - const UExtbyte *src, - unsigned_char_dynarr *dst, Bytecount n) +mswindows_multibyte_convert (struct coding_stream *UNUSED (str), + const UExtbyte *UNUSED (src), + unsigned_char_dynarr *UNUSED (dst), Bytecount n) { Bytecount orign = n; /* should never be called; is preprocessed away in the
--- a/src/intl-x.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/intl-x.c Mon Sep 20 19:20:08 2004 +0000 @@ -30,7 +30,13 @@ int init_x_locale (Lisp_Object locale); int -init_x_locale (Lisp_Object locale) +init_x_locale (Lisp_Object +#ifdef MULE + locale +#else + UNUSED (locale) +#endif + ) { #ifdef MULE /* dverna - Nov. 98: #### DON'T DO THIS !!! The default XtLanguageProc
--- a/src/keymap.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/keymap.c Mon Sep 20 19:20:08 2004 +0000 @@ -254,7 +254,8 @@ } static void -print_keymap (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_keymap (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { /* This function can GC */ Lisp_Keymap *keymap = XKEYMAP (obj); @@ -690,8 +691,8 @@ }; static int -keymap_submaps_mapper_0 (Lisp_Object key, Lisp_Object value, - void *keymap_submaps_closure) +keymap_submaps_mapper_0 (Lisp_Object UNUSED (key), Lisp_Object value, + void *UNUSED (keymap_submaps_closure)) { /* This function can GC */ /* Perform any autoloads, etc */ @@ -830,7 +831,7 @@ static Lisp_Object -traverse_keymaps_noop (Lisp_Object keymap, void *arg) +traverse_keymaps_noop (Lisp_Object UNUSED (keymap), void *UNUSED (arg)) { return Qnil; } @@ -917,7 +918,7 @@ } static Lisp_Object -keymap_prompt_mapper (Lisp_Object keymap, void *arg) +keymap_prompt_mapper (Lisp_Object keymap, void *UNUSED (arg)) { return XKEYMAP (keymap)->prompt; } @@ -2896,7 +2897,7 @@ */ static int map_keymap_sort_predicate (Lisp_Object obj1, Lisp_Object obj2, - Lisp_Object pred) + Lisp_Object UNUSED (pred)) { /* obj1 and obj2 are conses with keysyms in their cars. Cdrs are ignored. */ @@ -3469,7 +3470,7 @@ to other keymaps or slots. This makes it possible to search for an indirect definition itself. */ - (definition, keymaps, firstonly, noindirect, event_or_keys)) + (definition, keymaps, firstonly, UNUSED (noindirect), event_or_keys)) { /* This function can GC */ Lisp_Object maps[100];
--- a/src/lread.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/lread.c Mon Sep 20 19:20:08 2004 +0000 @@ -2748,7 +2748,7 @@ }; static void * -read_list_conser (Lisp_Object readcharfun, void *state, Charcount len) +read_list_conser (Lisp_Object readcharfun, void *state, Charcount UNUSED (len)) { struct read_list_state *s = (struct read_list_state *) state; Lisp_Object elt;
--- a/src/lstream.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/lstream.c Mon Sep 20 19:20:08 2004 +0000 @@ -58,7 +58,8 @@ } static void -print_lstream (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_lstream (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { Lstream *lstr = XLSTREAM (obj); @@ -1601,7 +1602,7 @@ } static int -dynarr_closer (Lstream *stream) +dynarr_closer (Lstream *UNUSED (stream)) { return 0; }
--- a/src/marker.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/marker.c Mon Sep 20 19:20:08 2004 +0000 @@ -54,7 +54,8 @@ } static void -print_marker (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_marker (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { Lisp_Marker *marker = XMARKER (obj); @@ -76,7 +77,7 @@ } static int -marker_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) +marker_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) { Lisp_Marker *marker1 = XMARKER (obj1); Lisp_Marker *marker2 = XMARKER (obj2); @@ -88,7 +89,7 @@ } static unsigned long -marker_hash (Lisp_Object obj, int depth) +marker_hash (Lisp_Object obj, int UNUSED (depth)) { unsigned long hash = (unsigned long) XMARKER (obj)->buffer; if (hash)
--- a/src/menubar-gtk.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/menubar-gtk.c Mon Sep 20 19:20:08 2004 +0000 @@ -127,7 +127,7 @@ } static void -gtk_xemacs_menubar_init (GtkXEmacsMenubar *xemacs) +gtk_xemacs_menubar_init (GtkXEmacsMenubar *UNUSED (xemacs)) { } @@ -222,13 +222,13 @@ } static void -gtk_xemacs_accel_label_class_init(GtkXEmacsAccelLabelClass *klass) +gtk_xemacs_accel_label_class_init(GtkXEmacsAccelLabelClass *UNUSED (klass)) { /* Nothing to do. */ } static void -gtk_xemacs_accel_label_init(GtkXEmacsAccelLabel *xemacs) +gtk_xemacs_accel_label_init(GtkXEmacsAccelLabel *UNUSED (xemacs)) { /* Nothing to do. */ } @@ -311,7 +311,7 @@ #ifdef TEAR_OFF_MENUS static void -__torn_off_sir(GtkMenuItem *item, gpointer user_data) +__torn_off_sir(GtkMenuItem *UNUSED (item), gpointer user_data) { GtkWidget *menu_item = GTK_WIDGET (user_data); @@ -342,7 +342,7 @@ does the delayed creation of the menu items. We populate the submenu and away we go. */ static void -__maybe_destroy (GtkWidget *child, GtkWidget *precious) +__maybe_destroy (GtkWidget *child, GtkWidget *UNUSED (precious)) { if (GTK_IS_MENU_ITEM (child) && !GTK_IS_TEAROFF_MENU_ITEM (child)) { @@ -456,7 +456,7 @@ } static void -__kill_stupid_gtk_timer (GtkObject *obj, gpointer user_data) +__kill_stupid_gtk_timer (GtkObject *obj, gpointer UNUSED (user_data)) { GtkMenuItem *mi = GTK_MENU_ITEM (obj); @@ -1196,7 +1196,8 @@ #endif static gboolean -run_menubar_hook (GtkWidget *widget, GdkEventButton *event, gpointer user_data) +run_menubar_hook (GtkWidget *widget, GdkEventButton *UNUSED (event), + gpointer UNUSED (user_data)) { if (!GTK_MENU_SHELL(widget)->active) { @@ -1389,7 +1390,7 @@ } static void -popdown_menu_cb (GtkMenuShell *menu, gpointer user_data) +popdown_menu_cb (GtkMenuShell *UNUSED (menu), gpointer UNUSED (user_data)) { popup_up_p--; }
--- a/src/menubar-msw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/menubar-msw.c Mon Sep 20 19:20:08 2004 +0000 @@ -609,7 +609,7 @@ /* Message handlers */ /*------------------------------------------------------------------------*/ static Lisp_Object -unsafe_handle_wm_initmenupopup_1 (HMENU menu, struct frame *f) +unsafe_handle_wm_initmenupopup_1 (HMENU menu, struct frame *UNUSED (f)) { /* This function can call lisp, beat dogs and stick chewing gum to everything! */
--- a/src/menubar-x.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/menubar-x.c Mon Sep 20 19:20:08 2004 +0000 @@ -442,7 +442,8 @@ */ static void -pre_activate_callback (Widget widget, LWLIB_ID id, XtPointer client_data) +pre_activate_callback (Widget widget, LWLIB_ID UNUSED (id), + XtPointer client_data) { /* This function can GC */ struct device *d = get_device_from_display (XtDisplay (widget)); @@ -647,7 +648,8 @@ } static void -popup_menu_down_callback (Widget widget, LWLIB_ID id, XtPointer client_data) +popup_menu_down_callback (Widget widget, LWLIB_ID id, + XtPointer UNUSED (client_data)) { if (popup_handled_p (id)) return; @@ -1147,7 +1149,8 @@ } static Lisp_Object -menu_accelerator_junk_on_error (Lisp_Object errordata, Lisp_Object ignored) +menu_accelerator_junk_on_error (Lisp_Object errordata, + Lisp_Object UNUSED (ignored)) { Vmenu_accelerator_prefix = Qnil; Vmenu_accelerator_modifiers = Qnil;
--- a/src/menubar.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/menubar.c Mon Sep 20 19:20:08 2004 +0000 @@ -88,8 +88,8 @@ Lisp_Object Qmenu_escape; static int -menubar_variable_changed (Lisp_Object sym, Lisp_Object *val, - Lisp_Object in_object, int flags) +menubar_variable_changed (Lisp_Object UNUSED (sym), Lisp_Object *UNUSED (val), + Lisp_Object UNUSED (in_object), int UNUSED (flags)) { MARK_MENUBAR_CHANGED; return 0; @@ -114,15 +114,17 @@ } static void -menubar_visible_p_changed (Lisp_Object specifier, struct window *w, - Lisp_Object oldval) +menubar_visible_p_changed (Lisp_Object UNUSED (specifier), + struct window *UNUSED (w), + Lisp_Object UNUSED (oldval)) { MARK_MENUBAR_CHANGED; } static void -menubar_visible_p_changed_in_frame (Lisp_Object specifier, struct frame *f, - Lisp_Object oldval) +menubar_visible_p_changed_in_frame (Lisp_Object UNUSED (specifier), + struct frame *f, + Lisp_Object UNUSED (oldval)) { update_frame_menubars (f); }
--- a/src/minibuf.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/minibuf.c Mon Sep 20 19:20:08 2004 +0000 @@ -146,8 +146,6 @@ never returns, we can never call unbind_to_1. Since we exit via a throw, we let whoever catches unbind for us. */ - Lisp_Object val; - CHECK_STRING (prompt); single_console_state (); @@ -191,9 +189,9 @@ minibuf_level++; clear_echo_area (selected_frame (), Qnil, 0); - val = call_command_loop (Qt); + call_command_loop (Qt); - RETURN_NOT_REACHED (val); + RETURN_NOT_REACHED (Qnil); } @@ -776,7 +774,7 @@ } int -echo_area_active (struct frame *f) +echo_area_active (struct frame *UNUSED (f)) { /* By definition, the echo area is active if the echo-area buffer is not empty. No need to call Lisp code. (Anyway, this function @@ -800,7 +798,7 @@ } Lisp_Object -echo_area_contents (struct frame *f) +echo_area_contents (struct frame *UNUSED (f)) { /* See above. By definition, the contents of the echo-area buffer are the contents of the echo area. */
--- a/src/miscplay.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/miscplay.c Mon Sep 20 19:20:08 2004 +0000 @@ -29,12 +29,6 @@ #include "syssignal.h" #include "sysfile.h" -#ifdef __GNUC__ -#define UNUSED(x) ((void)(x)) -#else -#define UNUSED(x) -#endif - /* Maintain global variable for keeping parser state information; this struct is set to zero before the first invocation of the parser. The use of a global variable prevents multiple concurrent executions of this code, but @@ -102,11 +96,9 @@ /* Currently we cannot cope with files in VOC format; if you really need to play these files, they should be converted by using SOX */ -static size_t parsevoc(void **data,size_t *sz,void **outbuf) +static size_t parsevoc(void **UNUSED (data), size_t *UNUSED (sz), + void **UNUSED (outbuf)) { - UNUSED(data); - UNUSED(sz); - UNUSED(outbuf); return(0); }
--- a/src/mule-canna.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/mule-canna.c Mon Sep 20 19:20:08 2004 +0000 @@ -497,7 +497,6 @@ { jrKanjiStatusWithValue ksv; jrKanjiStatus ks; - int len; #ifdef CANNA_MULE unsigned char cbuf[4096]; #endif @@ -514,7 +513,7 @@ ks.length = strlen ((const char *) cbuf); #endif /* CANNA_MULE */ ksv.ks = &ks; - len = jrKanjiControl (0, KC_DEFINEKANJI, (char *)&ksv); + jrKanjiControl (0, KC_DEFINEKANJI, (char *)&ksv); return storeResults (key_buffer, ksv.val, ksv.ks); } @@ -794,7 +793,7 @@ { int i, slen, len; unsigned char *p, RkBuf[RKBUFSIZE]; - Lisp_Object res = Qnil, endp; + Lisp_Object res = Qnil; CHECK_INT (bunsetsu); if (confirmContext () == 0) @@ -809,11 +808,11 @@ slen = strlen ((const char *) p); if (NILP(res)) { - endp = res = Fcons (make_string (p, slen), Qnil); + res = Fcons (make_string (p, slen), Qnil); } else { - endp = XCDR (res) = Fcons (make_string (p, slen), Qnil); + XCDR (res) = Fcons (make_string (p, slen), Qnil); } p += slen + 1; }
--- a/src/mule-ccl.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/mule-ccl.c Mon Sep 20 19:20:08 2004 +0000 @@ -728,9 +728,9 @@ } \ else \ { \ - Ibyte work[MAX_ICHAR_LEN]; \ + Ibyte work[MAX_ICHAR_LEN]; \ int len; \ - len = non_ascii_set_itext_ichar (work, ch); \ + len = non_ascii_set_itext_ichar (work, ch); \ Dynarr_add_many (destination, work, len); \ } \ } \ @@ -742,9 +742,9 @@ } \ else \ { \ - Ibyte work[MAX_ICHAR_LEN]; \ + Ibyte work[MAX_ICHAR_LEN]; \ int len; \ - len = non_ascii_set_itext_ichar (work, ch); \ + len = non_ascii_set_itext_ichar (work, ch); \ Dynarr_add_many (destination, work, len); \ } \ } \ @@ -755,8 +755,8 @@ cannot handle a multibyte string except for Control-1 characters. */ #define CCL_WRITE_STRING(len) \ do { \ - Ibyte work[MAX_ICHAR_LEN]; \ - int ch, bytes; \ + Ibyte work[MAX_ICHAR_LEN]; \ + int ch; \ if (!destination) \ CCL_INVALID_CMD; \ else if (conversion_mode == CCL_MODE_ENCODING) \ @@ -783,7 +783,7 @@ } \ else \ { \ - bytes = non_ascii_set_itext_ichar (work, ch); \ + non_ascii_set_itext_ichar (work, ch); \ Dynarr_add_many (destination, work, len); \ } \ } \ @@ -800,7 +800,7 @@ } \ else \ { \ - bytes = non_ascii_set_itext_ichar (work, ch); \ + non_ascii_set_itext_ichar (work, ch); \ Dynarr_add_many (destination, work, len); \ } \ } \
--- a/src/mule-charset.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/mule-charset.c Mon Sep 20 19:20:08 2004 +0000 @@ -134,7 +134,8 @@ } static void -print_charset (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_charset (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { Lisp_Charset *cs = XCHARSET (obj); @@ -382,7 +383,7 @@ }; static int -add_charset_to_list_mapper (Lisp_Object key, Lisp_Object value, +add_charset_to_list_mapper (Lisp_Object UNUSED (key), Lisp_Object value, void *charset_list_closure) { /* This function can GC */ @@ -1014,8 +1015,8 @@ } static int -init_charset_unicode_tables_mapper (Lisp_Object key, Lisp_Object value, - void *closure) +init_charset_unicode_tables_mapper (Lisp_Object UNUSED (key), + Lisp_Object value, void *UNUSED (closure)) { init_charset_unicode_tables (value); return 0;
--- a/src/mule-coding.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/mule-coding.c Mon Sep 20 19:20:08 2004 +0000 @@ -2585,7 +2585,13 @@ } static void -iso2022_finalize_coding_stream (struct coding_stream *str) +iso2022_finalize_coding_stream ( +#ifdef ENABLE_COMPOSITE_CHARS + struct coding_stream *str +#else + struct coding_stream *UNUSED (str) +#endif + ) { #ifdef ENABLE_COMPOSITE_CHARS struct iso2022_coding_stream *data = @@ -2662,7 +2668,8 @@ } static void -iso2022_print (Lisp_Object cs, Lisp_Object printcharfun, int escapeflag) +iso2022_print (Lisp_Object cs, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { int i;
--- a/src/nas.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/nas.c Mon Sep 20 19:20:08 2004 +0000 @@ -252,9 +252,9 @@ \********************************************************************/ static void -doneCB (AuServer *auserver, - AuEventHandlerRec *handler, - AuEvent *ev, +doneCB (AuServer *UNUSED (auserver), + AuEventHandlerRec *UNUSED (handler), + AuEvent *UNUSED (ev), AuPointer data) { int *in_play_p = (int *) data; @@ -593,14 +593,14 @@ } SIGTYPE -sigpipe_handle (int signo) +sigpipe_handle (int UNUSED (signo)) { CatchIoErrorAndJump (NULL); } static AuBool CatchErrorAndJump (AuServer *old_aud, - AuErrorEvent *event) + AuErrorEvent *UNUSED (event)) { return CatchIoErrorAndJump (old_aud); }
--- a/src/native-gtk-toolbar.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/native-gtk-toolbar.c Mon Sep 20 19:20:08 2004 +0000 @@ -57,7 +57,7 @@ gtk_clear_toolbar (struct frame *f, enum toolbar_pos pos); static void -gtk_toolbar_callback (GtkWidget *w, gpointer user_data) +gtk_toolbar_callback (GtkWidget *UNUSED (w), gpointer user_data) { struct toolbar_button *tb = (struct toolbar_button *) user_data; @@ -226,7 +226,7 @@ } static void -gtk_initialize_frame_toolbars (struct frame *f) +gtk_initialize_frame_toolbars (struct frame *UNUSED (f)) { stderr_out ("We should draw toolbars\n"); }
--- a/src/nt.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/nt.c Mon Sep 20 19:20:08 2004 +0000 @@ -856,7 +856,7 @@ } struct direct * -mswindows_readdir (DIR *dirp) +mswindows_readdir (DIR *UNUSED (dirp)) { Ibyte *val; int need_to_free = 0; @@ -947,7 +947,7 @@ } static Ibyte * -read_unc_volume (HANDLE henum) +read_unc_volume (HANDLE UNUSED (henum)) { DWORD count; int result;
--- a/src/ntplay.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/ntplay.c Mon Sep 20 19:20:08 2004 +0000 @@ -35,7 +35,7 @@ int volume, int convert); void -play_sound_file (Extbyte *sound_file, int volume) +play_sound_file (Extbyte *sound_file, int UNUSED (volume)) { DWORD flags = SND_ASYNC | SND_NODEFAULT | SND_FILENAME; Lisp_Object fname = @@ -82,7 +82,7 @@ /* mswindows can't cope with playing a sound from alloca space so we have to convert if necessary */ static int -play_sound_data_1 (UChar_Binary *data, int length, int volume, +play_sound_data_1 (UChar_Binary *data, int length, int UNUSED (volume), int convert_to_malloc) { DWORD flags = SND_ASYNC | SND_MEMORY | SND_NODEFAULT;
--- a/src/number-gmp.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/number-gmp.c Mon Sep 20 19:20:08 2004 +0000 @@ -78,13 +78,12 @@ /* We need the next two functions since GNU MP insists on giving us an extra parameter. */ -static void *gmp_realloc (void *ptr, size_t old_size /* unused */, - size_t new_size) +static void *gmp_realloc (void *ptr, size_t UNUSED (old_size), size_t new_size) { return xrealloc (ptr, new_size); } -static void gmp_free (void *ptr, size_t size /* unused */) +static void gmp_free (void *ptr, size_t UNUSED (size)) { xfree (ptr, void *); }
--- a/src/number-gmp.h Mon Sep 20 19:11:29 2004 +0000 +++ b/src/number-gmp.h Mon Sep 20 19:20:08 2004 +0000 @@ -29,6 +29,12 @@ #ifndef INCLUDED_number_gmp_h_ #define INCLUDED_number_gmp_h_ +#ifdef UNO +/* Uno complains about several inline functions that include conditions with + assignments and side effects if we don't do this */ +#undef __GNUC__ +#endif + #include <gmp.h> typedef mpz_t bignum;
--- a/src/number.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/number.c Mon Sep 20 19:20:08 2004 +0000 @@ -44,7 +44,8 @@ /********************************* Bignums **********************************/ #ifdef HAVE_BIGNUM static void -bignum_print (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +bignum_print (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { CIbyte *bstr = bignum_to_string (XBIGNUM_DATA (obj), 10); write_c_string (printcharfun, bstr); @@ -52,13 +53,13 @@ } static int -bignum_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) +bignum_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) { return bignum_eql (XBIGNUM_DATA (obj1), XBIGNUM_DATA (obj2)); } static Hashcode -bignum_hash (Lisp_Object obj, int depth) +bignum_hash (Lisp_Object obj, int UNUSED (depth)) { return bignum_hashcode (XBIGNUM_DATA (obj)); } @@ -120,7 +121,8 @@ /********************************** Ratios **********************************/ #ifdef HAVE_RATIO static void -ratio_print (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +ratio_print (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { CIbyte *rstr = ratio_to_string (XRATIO_DATA (obj), 10); write_c_string (printcharfun, rstr); @@ -128,13 +130,13 @@ } static int -ratio_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) +ratio_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) { return ratio_eql (XRATIO_DATA (obj1), XRATIO_DATA (obj2)); } static Hashcode -ratio_hash (Lisp_Object obj, int depth) +ratio_hash (Lisp_Object obj, int UNUSED (depth)) { return ratio_hashcode (XRATIO_DATA (obj)); } @@ -206,7 +208,8 @@ /******************************** Bigfloats *********************************/ #ifdef HAVE_BIGFLOAT static void -bigfloat_print (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +bigfloat_print (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { CIbyte *fstr = bigfloat_to_string (XBIGFLOAT_DATA (obj), 10); write_c_string (printcharfun, fstr); @@ -214,13 +217,13 @@ } static int -bigfloat_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) +bigfloat_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) { return bigfloat_eql (XBIGFLOAT_DATA (obj1), XBIGFLOAT_DATA (obj2)); } static Hashcode -bigfloat_hash (Lisp_Object obj, int depth) +bigfloat_hash (Lisp_Object obj, int UNUSED (depth)) { return bigfloat_hashcode (XBIGFLOAT_DATA (obj)); } @@ -295,8 +298,9 @@ } static int -default_float_precision_changed (Lisp_Object sym, Lisp_Object *val, - Lisp_Object in_object, int flags) +default_float_precision_changed (Lisp_Object UNUSED (sym), Lisp_Object *val, + Lisp_Object UNUSED (in_object), + int UNUSED (flags)) { unsigned long prec; @@ -406,7 +410,12 @@ PRECISION; otherwise, PRECISION is ignored. */ static Lisp_Object internal_coerce_number (Lisp_Object number, enum number_type type, - unsigned long precision) +#ifdef HAVE_BIGFLOAT + unsigned long precision +#else + unsigned long UNUSED (precision) +#endif + ) { enum number_type current_type; @@ -638,7 +647,13 @@ Note that some conversions lose information. No error is signaled in such cases; the information is silently lost. */ - (number, type, precision)) + (number, type, +#ifdef HAVE_BIGFLOAT + precision +#else + UNUSED (precision) +#endif + )) { CHECK_SYMBOL (type); if (EQ (type, Qfixnum))
--- a/src/objects-gtk.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/objects-gtk.c Mon Sep 20 19:20:08 2004 +0000 @@ -58,7 +58,7 @@ Return value is 1 for normal success, 2 for nearest color success, 3 for Non-deallocable sucess. */ int -allocate_nearest_color (GdkColormap *colormap, GdkVisual *visual, +allocate_nearest_color (GdkColormap *colormap, GdkVisual *UNUSED (visual), GdkColor *color_def) { int rc; @@ -138,7 +138,7 @@ static void gtk_print_color_instance (struct Lisp_Color_Instance *c, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { GdkColor *color = COLOR_INSTANCE_GTK_COLOR (c); write_fmt_string (printcharfun, " %ld=(%X,%X,%X)", @@ -172,14 +172,14 @@ static int gtk_color_instance_equal (struct Lisp_Color_Instance *c1, struct Lisp_Color_Instance *c2, - int depth) + int UNUSED (depth)) { return (gdk_color_equal (COLOR_INSTANCE_GTK_COLOR (c1), COLOR_INSTANCE_GTK_COLOR (c2))); } static unsigned long -gtk_color_instance_hash (struct Lisp_Color_Instance *c, int depth) +gtk_color_instance_hash (struct Lisp_Color_Instance *c, int UNUSED (depth)) { return (gdk_color_hash (COLOR_INSTANCE_GTK_COLOR (c), NULL)); } @@ -194,7 +194,7 @@ } static int -gtk_valid_color_name_p (struct device *d, Lisp_Object color) +gtk_valid_color_name_p (struct device *UNUSED (d), Lisp_Object color) { GdkColor c; const char *extname; @@ -212,8 +212,9 @@ /************************************************************************/ static int -gtk_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object name, - Lisp_Object device, Error_Behavior errb) +gtk_initialize_font_instance (struct Lisp_Font_Instance *f, + Lisp_Object UNUSED (name), + Lisp_Object UNUSED (device), Error_Behavior errb) { GdkFont *gf; XFontStruct *xf; @@ -307,7 +308,7 @@ static void gtk_print_font_instance (struct Lisp_Font_Instance *f, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { write_fmt_string (printcharfun, " 0x%lx", (unsigned long) gdk_font_id (FONT_INSTANCE_GTK_FONT (f))); @@ -332,7 +333,8 @@ static Lisp_Object __gtk_list_fonts_internal (const char *pattern); static Lisp_Object -gtk_font_instance_truename (struct Lisp_Font_Instance *f, Error_Behavior errb) +gtk_font_instance_truename (struct Lisp_Font_Instance *f, + Error_Behavior UNUSED (errb)) { if (NILP (FONT_INSTANCE_TRUENAME (f))) { @@ -349,7 +351,7 @@ } static Lisp_Object -gtk_font_instance_properties (struct Lisp_Font_Instance *f) +gtk_font_instance_properties (struct Lisp_Font_Instance *UNUSED (f)) { Lisp_Object result = Qnil; @@ -359,7 +361,8 @@ } static Lisp_Object -gtk_list_fonts (Lisp_Object pattern, Lisp_Object device, Lisp_Object maxnumber) +gtk_list_fonts (Lisp_Object pattern, Lisp_Object UNUSED (device), + Lisp_Object UNUSED (maxnumber)) { const char *patternext; @@ -371,7 +374,7 @@ #ifdef MULE static int -gtk_font_spec_matches_charset (struct device *d, Lisp_Object charset, +gtk_font_spec_matches_charset (struct device *UNUSED (d), Lisp_Object charset, const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length, int stage)
--- a/src/objects-msw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/objects-msw.c Mon Sep 20 19:20:08 2004 +0000 @@ -1155,8 +1155,9 @@ } static int CALLBACK -font_enum_callback_1 (ENUMLOGFONTEXW *lpelfe, NEWTEXTMETRICEXW *lpntme, - int FontType, struct font_enum_t *font_enum) +font_enum_callback_1 (ENUMLOGFONTEXW *lpelfe, + NEWTEXTMETRICEXW *UNUSED (lpntme), + int UNUSED (FontType), struct font_enum_t *font_enum) { /* This function gets called once per facename per character set. * We call a second callback to enumerate the fonts in each facename */ @@ -1172,7 +1173,7 @@ static int sort_font_list_function (Lisp_Object obj1, Lisp_Object obj2, - Lisp_Object pred) + Lisp_Object UNUSED (pred)) { Ibyte *font1, *font2; Ibyte *c1, *c2; @@ -1334,7 +1335,8 @@ static int mswindows_initialize_color_instance (Lisp_Color_Instance *c, Lisp_Object name, - Lisp_Object device, Error_Behavior errb) + Lisp_Object UNUSED (device), + Error_Behavior errb) { COLORREF color; @@ -1360,7 +1362,7 @@ static void mswindows_print_color_instance (Lisp_Color_Instance *c, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { COLORREF color = COLOR_INSTANCE_MSWINDOWS_COLOR (c); write_fmt_string (printcharfun, @@ -1382,14 +1384,14 @@ static int mswindows_color_instance_equal (Lisp_Color_Instance *c1, Lisp_Color_Instance *c2, - int depth) + int UNUSED (depth)) { return (COLOR_INSTANCE_MSWINDOWS_COLOR (c1) == COLOR_INSTANCE_MSWINDOWS_COLOR (c2)); } static unsigned long -mswindows_color_instance_hash (Lisp_Color_Instance *c, int depth) +mswindows_color_instance_hash (Lisp_Color_Instance *c, int UNUSED (depth)) { return (unsigned long) COLOR_INSTANCE_MSWINDOWS_COLOR (c); } @@ -1404,7 +1406,7 @@ } static int -mswindows_valid_color_name_p (struct device *d, Lisp_Object color) +mswindows_valid_color_name_p (struct device *UNUSED (d), Lisp_Object color) { return (mswindows_string_to_color (XSTRING_DATA (color)) != (COLORREF) -1); } @@ -1915,7 +1917,7 @@ static void mswindows_print_font_instance (Lisp_Font_Instance *f, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { write_fmt_string (printcharfun, " 0x%lx", (unsigned long) @@ -1925,7 +1927,7 @@ static Lisp_Object mswindows_list_fonts (Lisp_Object pattern, Lisp_Object device, - Lisp_Object maxnumber) + Lisp_Object UNUSED (maxnumber)) { struct device *d = XDEVICE (device); Lisp_Object font_list = Qnil, fonttail, result = Qnil; @@ -1951,7 +1953,8 @@ } static Lisp_Object -mswindows_font_instance_truename (Lisp_Font_Instance *f, Error_Behavior errb) +mswindows_font_instance_truename (Lisp_Font_Instance *f, + Error_Behavior UNUSED (errb)) { return f->truename; } @@ -1959,7 +1962,7 @@ #ifdef MULE static int -mswindows_font_spec_matches_charset_stage_1 (struct device *d, +mswindows_font_spec_matches_charset_stage_1 (struct device *UNUSED (d), Lisp_Object charset, const Ibyte *nonreloc, Lisp_Object reloc,
--- a/src/objects-tty.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/objects-tty.c Mon Sep 20 19:20:08 2004 +0000 @@ -160,7 +160,8 @@ static int tty_initialize_color_instance (Lisp_Color_Instance *c, Lisp_Object name, - Lisp_Object device, Error_Behavior errb) + Lisp_Object UNUSED (device), + Error_Behavior UNUSED (errb)) { Lisp_Object result; @@ -190,9 +191,9 @@ } static void -tty_print_color_instance (Lisp_Color_Instance *c, - Lisp_Object printcharfun, - int escapeflag) +tty_print_color_instance (Lisp_Color_Instance *UNUSED (c), + Lisp_Object UNUSED (printcharfun), + int UNUSED (escapeflag)) { } @@ -206,20 +207,20 @@ static int tty_color_instance_equal (Lisp_Color_Instance *c1, Lisp_Color_Instance *c2, - int depth) + int UNUSED (depth)) { return (EQ (COLOR_INSTANCE_TTY_SYMBOL (c1), COLOR_INSTANCE_TTY_SYMBOL (c2))); } static unsigned long -tty_color_instance_hash (Lisp_Color_Instance *c, int depth) +tty_color_instance_hash (Lisp_Color_Instance *c, int UNUSED (depth)) { return LISP_HASH (COLOR_INSTANCE_TTY_SYMBOL (c)); } static int -tty_valid_color_name_p (struct device *d, Lisp_Object color) +tty_valid_color_name_p (struct device *UNUSED (d), Lisp_Object color) { return (!NILP (assoc_no_quit (Fintern (color, Qnil), Vtty_color_alist))); #if 0 @@ -231,7 +232,8 @@ static int tty_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name, - Lisp_Object device, Error_Behavior errb) + Lisp_Object UNUSED (device), + Error_Behavior UNUSED (errb)) { Ibyte *str = XSTRING_DATA (name); Lisp_Object charset = Qnil; @@ -277,9 +279,9 @@ } static void -tty_print_font_instance (Lisp_Font_Instance *f, - Lisp_Object printcharfun, - int escapeflag) +tty_print_font_instance (Lisp_Font_Instance *UNUSED (f), + Lisp_Object UNUSED (printcharfun), + int UNUSED (escapeflag)) { } @@ -291,7 +293,8 @@ } static Lisp_Object -tty_list_fonts (Lisp_Object pattern, Lisp_Object device, Lisp_Object maxnumber) +tty_list_fonts (Lisp_Object UNUSED (pattern), Lisp_Object UNUSED (device), + Lisp_Object UNUSED (maxnumber)) { return list1 (build_string ("normal")); } @@ -299,7 +302,7 @@ #ifdef MULE static int -tty_font_spec_matches_charset (struct device *d, Lisp_Object charset, +tty_font_spec_matches_charset (struct device *UNUSED (d), Lisp_Object charset, const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length, int stage)
--- a/src/objects-x.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/objects-x.c Mon Sep 20 19:20:08 2004 +0000 @@ -283,7 +283,7 @@ static void x_print_color_instance (Lisp_Color_Instance *c, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { XColor color = COLOR_INSTANCE_X_COLOR (c); write_fmt_string (printcharfun, " %ld=(%X,%X,%X)", @@ -317,7 +317,7 @@ static int x_color_instance_equal (Lisp_Color_Instance *c1, Lisp_Color_Instance *c2, - int depth) + int UNUSED (depth)) { XColor color1 = COLOR_INSTANCE_X_COLOR (c1); XColor color2 = COLOR_INSTANCE_X_COLOR (c2); @@ -327,7 +327,7 @@ } static unsigned long -x_color_instance_hash (Lisp_Color_Instance *c, int depth) +x_color_instance_hash (Lisp_Color_Instance *c, int UNUSED (depth)) { XColor color = COLOR_INSTANCE_X_COLOR (c); return HASH3 (color.red, color.green, color.blue); @@ -361,7 +361,7 @@ /************************************************************************/ static int -x_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name, +x_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object UNUSED (name), Lisp_Object device, Error_Behavior errb) { Display *dpy = DEVICE_X_DISPLAY (XDEVICE (device)); @@ -456,7 +456,7 @@ static void x_print_font_instance (Lisp_Font_Instance *f, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { write_fmt_string (printcharfun, " 0x%lx", (unsigned long) FONT_INSTANCE_X_FONT (f)->fid); @@ -881,7 +881,7 @@ #ifdef MULE static int -x_font_spec_matches_charset (struct device *d, Lisp_Object charset, +x_font_spec_matches_charset (struct device *UNUSED (d), Lisp_Object charset, const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length, int stage)
--- a/src/objects.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/objects.c Mon Sep 20 19:20:08 2004 +0000 @@ -556,7 +556,7 @@ of for `equal' */ static Lisp_Object -color_instantiate (Lisp_Object specifier, Lisp_Object matchspec, +color_instantiate (Lisp_Object specifier, Lisp_Object UNUSED (matchspec), Lisp_Object domain, Lisp_Object instantiator, Lisp_Object depth) { @@ -789,7 +789,7 @@ static Lisp_Object -font_instantiate (Lisp_Object specifier, Lisp_Object matchspec, +font_instantiate (Lisp_Object UNUSED (specifier), Lisp_Object matchspec, Lisp_Object domain, Lisp_Object instantiator, Lisp_Object depth) { @@ -986,7 +986,8 @@ of for `equal' */ static Lisp_Object -face_boolean_instantiate (Lisp_Object specifier, Lisp_Object matchspec, +face_boolean_instantiate (Lisp_Object specifier, + Lisp_Object UNUSED (matchspec), Lisp_Object domain, Lisp_Object instantiator, Lisp_Object depth) {
--- a/src/opaque.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/opaque.c Mon Sep 20 19:20:08 2004 +0000 @@ -42,7 +42,8 @@ /* Should never, ever be called. (except by an external debugger) */ static void -print_opaque (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_opaque (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { const Lisp_Opaque *p = XOPAQUE (obj); @@ -90,7 +91,7 @@ /* This will not work correctly for opaques with subobjects! */ static int -equal_opaque (Lisp_Object obj1, Lisp_Object obj2, int depth) +equal_opaque (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) { Bytecount size; return ((size = XOPAQUE_SIZE (obj1)) == XOPAQUE_SIZE (obj2) && @@ -100,7 +101,7 @@ /* This will not work correctly for opaques with subobjects! */ static unsigned long -hash_opaque (Lisp_Object obj, int depth) +hash_opaque (Lisp_Object obj, int UNUSED (depth)) { if (XOPAQUE_SIZE (obj) == sizeof (unsigned long)) return *((unsigned long *) XOPAQUE_DATA (obj)); @@ -123,7 +124,8 @@ /* Should never, ever be called. (except by an external debugger) */ static void -print_opaque_ptr (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_opaque_ptr (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { const Lisp_Opaque_Ptr *p = XOPAQUE_PTR (obj); @@ -134,13 +136,13 @@ } static int -equal_opaque_ptr (Lisp_Object obj1, Lisp_Object obj2, int depth) +equal_opaque_ptr (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) { return (XOPAQUE_PTR (obj1)->ptr == XOPAQUE_PTR (obj2)->ptr); } static unsigned long -hash_opaque_ptr (Lisp_Object obj, int depth) +hash_opaque_ptr (Lisp_Object obj, int UNUSED (depth)) { return (unsigned long) XOPAQUE_PTR (obj)->ptr; }
--- a/src/print.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/print.c Mon Sep 20 19:20:08 2004 +0000 @@ -1438,7 +1438,7 @@ static void default_object_printer (Lisp_Object obj, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { struct lcrecord_header *header = (struct lcrecord_header *) XPNTR (obj); @@ -1456,7 +1456,7 @@ void internal_object_printer (Lisp_Object obj, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { write_fmt_string (printcharfun, "#<INTERNAL OBJECT (XEmacs bug?) (%s) 0x%lx>", @@ -1746,7 +1746,8 @@ } void -print_float (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_float (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { char pigbuf[350]; /* see comments in float_to_string */ @@ -2057,7 +2058,7 @@ avoid consing in debug_prin1. That is verboten, since debug_prin1 can be called by cons debugging code. */ static Lisp_Object -debug_prin1_exit (Lisp_Object ignored UNUSED_ARG) +debug_prin1_exit (Lisp_Object UNUSED (ignored)) { struct debug_bindings *bindings = (struct debug_bindings *) XOPAQUE (debug_prin1_bindings)->data;
--- a/src/process-nt.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/process-nt.c Mon Sep 20 19:20:08 2004 +0000 @@ -1151,7 +1151,7 @@ static void nt_kill_child_process (Lisp_Object proc, int signo, - int current_group, int nomsg) + int UNUSED (current_group), int UNUSED (nomsg)) { Lisp_Process *p = XPROCESS (proc);
--- a/src/process-unix.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/process-unix.c Mon Sep 20 19:20:08 2004 +0000 @@ -96,7 +96,7 @@ /**********************************************************************/ static SIGTYPE -close_safely_handler (int signo) +close_safely_handler (int SIG_ARG_MAYBE_UNUSED (signo)) { EMACS_REESTABLISH_SIGNAL (signo, close_safely_handler); SIGRETURN; @@ -127,7 +127,8 @@ to get rid of irrelevant descriptors. */ static int -close_process_descs_mapfun (const void *key, void *contents, void *arg) +close_process_descs_mapfun (const void *UNUSED (key), void *contents, + void *UNUSED (arg)) { Lisp_Object proc = VOID_TO_LISP (contents); USID vaffan, culo; @@ -516,7 +517,13 @@ #endif /* !USE_GETADDRINFO */ static void -set_socket_nonblocking_maybe (int fd, int port, const char *proto) +set_socket_nonblocking_maybe (int fd, +#ifdef PROCESS_IO_BLOCKING + int port, const char *proto +#else + int UNUSED (port), const char *UNUSED (proto) +#endif + ) { #ifdef PROCESS_IO_BLOCKING Lisp_Object tail; @@ -696,7 +703,7 @@ behavior when we use sigaction(), which we do use.) */ static SIGTYPE -sigchld_handler (int signo) +sigchld_handler (int SIG_ARG_MAYBE_UNUSED (signo)) { #ifdef OBNOXIOUS_SYSV_SIGCLD_BEHAVIOR int old_errno = errno; @@ -836,8 +843,8 @@ */ static void -unix_init_process_io_handles (Lisp_Process *p, void *in, void *out, void *err, - int flags) +unix_init_process_io_handles (Lisp_Process *p, void *in, void *UNUSED (out), + void *err, int UNUSED (flags)) { UNIX_DATA(p)->infd = (int) in; UNIX_DATA(p)->errfd = (int) err;
--- a/src/profile.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/profile.c Mon Sep 20 19:20:08 2004 +0000 @@ -349,7 +349,7 @@ } static SIGTYPE -sigprof_handler (int signo) +sigprof_handler (int UNUSED (signo)) { #ifdef WIN32_ANY /* Windows unfortunately does not have any such thing as setitimer @@ -613,7 +613,7 @@ static int set_profiling_info_timing_maphash (Lisp_Object key, Lisp_Object val, - void *void_closure) + void *UNUSED (void_closure)) { /* This function does not GC */ if (!INTP (val)) @@ -669,8 +669,8 @@ static int mark_profiling_info_maphash (const void *void_key, - void *void_val, - void *void_closure) + void *UNUSED (void_val), + void *UNUSED (void_closure)) { #ifdef USE_KKCC kkcc_gc_stack_push_lisp_object (VOID_TO_LISP (void_key));
--- a/src/rangetab.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/rangetab.c Mon Sep 20 19:20:08 2004 +0000 @@ -52,7 +52,8 @@ } static void -print_range_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_range_table (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { Lisp_Range_Table *rt = XRANGE_TABLE (obj); int i; @@ -490,8 +491,8 @@ /************************************************************************/ static int -rangetab_data_validate (Lisp_Object keyword, Lisp_Object value, - Error_Behavior errb) +rangetab_data_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, + Error_Behavior UNUSED (errb)) { Lisp_Object rest;
--- a/src/redisplay-gtk.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/redisplay-gtk.c Mon Sep 20 19:20:08 2004 +0000 @@ -236,8 +236,8 @@ */ static int -gtk_text_width (struct frame *f, struct face_cachel *cachel, CONST Ichar *str, - Charcount len) +gtk_text_width (struct frame *UNUSED (f), struct face_cachel *cachel, + CONST Ichar *str, Charcount len) { int width_so_far = 0; unsigned char *text_storage = (unsigned char *) ALLOCA (2 * len); @@ -1118,7 +1118,7 @@ int cursor_start, int cursor_width, int cursor_height, - int bg_pixmap) + int UNUSED (bg_pixmap)) { struct frame *f = XFRAME (w->frame); struct device *d = XDEVICE (f->device); @@ -1472,8 +1472,8 @@ given face. ****************************************************************************/ static void -gtk_clear_region (Lisp_Object locale, struct device* d, struct frame* f, face_index findex, - int x, int y, +gtk_clear_region (Lisp_Object UNUSED (locale), struct device* d, + struct frame* f, face_index UNUSED (findex), int x, int y, int width, int height, Lisp_Object fcolor, Lisp_Object bcolor, Lisp_Object background_pixmap) { @@ -1683,9 +1683,10 @@ } static void -gtk_bevel_area (struct window *w, face_index findex, +gtk_bevel_area (struct window *w, face_index UNUSED (findex), int x, int y, int width, int height, - int shadow_thickness, int edges, enum edge_style style) + int shadow_thickness, int UNUSED (edges), + enum edge_style UNUSED (style)) { struct frame *f = XFRAME (w->frame); @@ -1696,7 +1697,8 @@ /* Make audible bell. */ static void -gtk_ring_bell (struct device *d, int volume, int pitch, int duration) +gtk_ring_bell (struct device *UNUSED (d), int volume, int UNUSED (pitch), + int UNUSED (duration)) { /* Gdk does not allow us to control the duration / pitch / volume */ if (volume > 0)
--- a/src/redisplay-msw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/redisplay-msw.c Mon Sep 20 19:20:08 2004 +0000 @@ -210,7 +210,7 @@ ****************************************************************************/ static void mswindows_update_dc (HDC hdc, Lisp_Object fg, Lisp_Object bg, - Lisp_Object bg_pmap) + Lisp_Object UNUSED (bg_pmap)) { if (!NILP (fg)) { @@ -242,7 +242,9 @@ Output a horizontal line in the foreground of its face. ****************************************************************************/ static void -mswindows_output_hline (struct window *w, struct display_line *dl, struct rune *rb) +mswindows_output_hline (struct window *UNUSED (w), + struct display_line *UNUSED (dl), + struct rune *UNUSED (rb)) { /* #### Implement me */ } @@ -436,10 +438,10 @@ ****************************************************************************/ static void mswindows_output_string (struct window *w, struct display_line *dl, - Ichar_dynarr *buf, int xpos, int xoffset, int clip_start, - int width, face_index findex, - int cursor, int cursor_start, int cursor_width, - int cursor_height) + Ichar_dynarr *buf, int xpos, int xoffset, + int clip_start, int width, face_index findex, + int UNUSED (cursor), int UNUSED (cursor_start), + int UNUSED (cursor_width), int UNUSED (cursor_height)) { struct frame *f = XFRAME (w->frame); /* struct device *d = XDEVICE (f->device);*/ @@ -682,9 +684,10 @@ DGA normalized display_glyph_area. */ static void mswindows_output_pixmap (struct window *w, Lisp_Object image_instance, - struct display_box *db, struct display_glyph_area *dga, - face_index findex, int cursor_start, int cursor_width, - int cursor_height, int bg_pixmap) + struct display_box *db, + struct display_glyph_area *dga, face_index findex, + int UNUSED (cursor_start), int UNUSED (cursor_width), + int UNUSED (cursor_height), int bg_pixmap) { struct frame *f = XFRAME (w->frame); HDC hdc = get_frame_dc (f, 1); @@ -829,7 +832,7 @@ Perform any necessary initialization prior to an update. ****************************************************************************/ static void -mswindows_frame_output_begin (struct frame *f) +mswindows_frame_output_begin (struct frame *UNUSED (f)) { } @@ -839,7 +842,13 @@ Perform any necessary flushing of queues when an update has completed. ****************************************************************************/ static void -mswindows_frame_output_end (struct frame *f) +mswindows_frame_output_end (struct frame * +#ifdef DEFER_WINDOW_POS + f +#else + UNUSED (f) +#endif + ) { #ifdef DEFER_WINDOW_POS HDWP hdwp = FRAME_MSWINDOWS_DATA (f)->hdwp; @@ -855,7 +864,7 @@ /* Printer version is more lightweight. */ static void -msprinter_frame_output_end (struct frame *f) +msprinter_frame_output_end (struct frame *UNUSED (f)) { GdiFlush(); } @@ -877,7 +886,8 @@ } static void -mswindows_ring_bell (struct device *d, int volume, int pitch, int duration) +mswindows_ring_bell (struct device *UNUSED (d), int UNUSED (volume), + int UNUSED (pitch), int UNUSED (duration)) { /* Beep does not work at all, anyways! -kkm */ MessageBeep (MB_OK); @@ -1103,7 +1113,7 @@ Draw a vertical divider down the right side of the given window. ****************************************************************************/ static void -mswindows_output_vertical_divider (struct window *w, int clear_unused) +mswindows_output_vertical_divider (struct window *w, int UNUSED (clear_unused)) { struct frame *f = XFRAME (w->frame); HDC hdc = get_frame_dc (f, 1); @@ -1187,10 +1197,16 @@ given face. ****************************************************************************/ static void -mswindows_clear_region (Lisp_Object locale, struct device *d, struct frame *f, - face_index findex, int x, int y, - int width, int height, Lisp_Object fcolor, Lisp_Object bcolor, - Lisp_Object background_pixmap) +mswindows_clear_region ( +#ifdef HAVE_SCROLLBARS + Lisp_Object locale, +#else + Lisp_Object UNUSED (locale), +#endif + struct device *UNUSED (d), struct frame *f, + face_index UNUSED (findex), int x, int y, + int width, int height, Lisp_Object fcolor, + Lisp_Object bcolor, Lisp_Object background_pixmap) { RECT rect = { x, y, x+width, y+height }; HDC hdc = get_frame_dc (f, 1); @@ -1217,7 +1233,7 @@ /* #### Implement me! */ static void -mswindows_clear_frame (struct frame *f) +mswindows_clear_frame (struct frame *UNUSED (f)) { GdiFlush (); }
--- a/src/redisplay-output.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/redisplay-output.c Mon Sep 20 19:20:08 2004 +0000 @@ -68,7 +68,8 @@ Synchronize the given rune blocks. ****************************************************************************/ static void -sync_rune_structs (struct window *w, rune_dynarr *cra, rune_dynarr *dra) +sync_rune_structs (struct window *UNUSED (w), rune_dynarr *cra, + rune_dynarr *dra) { int rune_elt; int max_move = ((Dynarr_length (dra) > Dynarr_largest (cra)) @@ -493,7 +494,9 @@ int start_pos; int stop_pos; int force = 0; +#if 0 int block_end; +#endif cdb = Dynarr_atp (cdl->display_blocks, c_block); ddb = Dynarr_atp (ddl->display_blocks, d_block); @@ -503,11 +506,13 @@ start_pos = -1; stop_pos = min (Dynarr_length (cdb->runes), Dynarr_length (ddb->runes)); +#if 0 block_end = (!Dynarr_length (ddb->runes) ? 0 : (Dynarr_atp (ddb->runes, Dynarr_length (ddb->runes) - 1)->xpos + Dynarr_atp (ddb->runes, Dynarr_length (ddb->runes) - 1)->width)); +#endif /* If the new block type is not text and the cursor status is changing and it overlaps the position of this block then force a @@ -1311,8 +1316,9 @@ redisplay_output_subwindow (struct window *w, Lisp_Object image_instance, struct display_box* db, struct display_glyph_area* dga, - face_index findex, int cursor_start, int cursor_width, - int cursor_height) + face_index findex, int UNUSED (cursor_start), + int UNUSED (cursor_width), + int UNUSED (cursor_height)) { Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance); Lisp_Object window; @@ -1396,8 +1402,8 @@ redisplay_output_layout (Lisp_Object domain, Lisp_Object image_instance, struct display_box* db, struct display_glyph_area* dga, - face_index findex, int cursor_start, int cursor_width, - int cursor_height) + face_index findex, int UNUSED (cursor_start), + int UNUSED (cursor_width), int UNUSED (cursor_height)) { Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance); Lisp_Object rest, window = DOMAIN_WINDOW (domain);
--- a/src/redisplay-tty.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/redisplay-tty.c Mon Sep 20 19:20:08 2004 +0000 @@ -106,8 +106,8 @@ column, so we use ichar_string_displayed_columns(). ****************************************************************************/ static int -tty_text_width (struct frame *f, struct face_cachel *cachel, const Ichar *str, - Charcount len) +tty_text_width (struct frame *UNUSED (f), struct face_cachel *UNUSED (cachel), + const Ichar *str, Charcount len) { return ichar_string_displayed_columns (str, len); } @@ -141,13 +141,19 @@ Perform any necessary initialization prior to an update. ****************************************************************************/ +#ifdef HAVE_TERMIOS +#define TERMIOS_MAYBE_UNUSED(decl) UNUSED(decl) +#else +#define TERMIOS_MAYBE_UNUSED(decl) decl +#endif + #ifdef DEBUG_XEMACS -void tty_frame_output_begin (struct frame *f); +void tty_frame_output_begin (struct frame *TERMIOS_MAYBE_UNUSED(f)); void #else static void #endif -tty_frame_output_begin (struct frame *f) +tty_frame_output_begin (struct frame *TERMIOS_MAYBE_UNUSED(f)) { #ifndef HAVE_TERMIOS /* Termcap requires `ospeed' to be a global variable so we have to @@ -196,8 +202,8 @@ static void tty_output_display_block (struct window *w, struct display_line *dl, int block, int start, int end, int start_pixpos, - int cursor_start, int cursor_width, - int cursor_height) + int cursor_start, int UNUSED (cursor_width), + int UNUSED (cursor_height)) { struct frame *f = XFRAME (w->frame); Ichar_dynarr *buf = Dynarr_new (Ichar); @@ -377,7 +383,7 @@ Draw a vertical divider down the right side of the given window. ****************************************************************************/ static void -tty_output_vertical_divider (struct window *w, int clear) +tty_output_vertical_divider (struct window *w, int UNUSED (clear)) { /* Divider width can either be 0 or 1 on TTYs */ if (window_divider_width (w)) @@ -411,10 +417,11 @@ Clear the area in the box defined by the given parameters. ****************************************************************************/ static void -tty_clear_region (Lisp_Object window, struct device* d, struct frame * f, - face_index findex, int x, int y, - int width, int height, Lisp_Object fcolor, Lisp_Object bcolor, - Lisp_Object background_pixmap) +tty_clear_region (Lisp_Object window, struct device* UNUSED (d), + struct frame * f, face_index findex, int x, int y, + int width, int height, Lisp_Object UNUSED (fcolor), + Lisp_Object UNUSED (bcolor), + Lisp_Object UNUSED (background_pixmap)) { struct console *c = XCONSOLE (FRAME_CONSOLE (f)); int line; @@ -521,8 +528,8 @@ static void tty_output_ibyte_string (struct window *w, struct display_line *dl, - Ibyte *str, Bytecount len, int xpos, - face_index findex, int cursor) + Ibyte *str, Bytecount len, int xpos, + face_index findex, int UNUSED (cursor)) { struct frame *f = XFRAME (w->frame); struct console *c = XCONSOLE (FRAME_CONSOLE (f)); @@ -1034,7 +1041,8 @@ * tty_ring_bell - sound an audio beep. */ static void -tty_ring_bell (struct device *d, int volume, int pitch, int duration) +tty_ring_bell (struct device *d, int volume, int UNUSED (pitch), + int UNUSED (duration)) { struct console *c = XCONSOLE (DEVICE_CONSOLE (d)); @@ -1376,7 +1384,7 @@ } static Lisp_Object -term_get_fkeys_error (Lisp_Object err, Lisp_Object arg) +term_get_fkeys_error (Lisp_Object UNUSED (err), Lisp_Object arg) { return arg; }
--- a/src/redisplay-x.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/redisplay-x.c Mon Sep 20 19:20:08 2004 +0000 @@ -241,8 +241,8 @@ */ static int -x_text_width (struct frame *f, struct face_cachel *cachel, const Ichar *str, - Charcount len) +x_text_width (struct frame *UNUSED (f), struct face_cachel *cachel, + const Ichar *str, Charcount len) { int width_so_far = 0; unsigned char *text_storage = (unsigned char *) ALLOCA (2 * len); @@ -291,7 +291,7 @@ Perform any necessary initialization prior to an update. ****************************************************************************/ static void -x_window_output_begin (struct window *w) +x_window_output_begin (struct window *UNUSED (w)) { } @@ -1235,7 +1235,7 @@ x_output_pixmap (struct window *w, Lisp_Object image_instance, struct display_box *db, struct display_glyph_area *dga, face_index findex, int cursor_start, int cursor_width, - int cursor_height, int bg_pixmap) + int cursor_height, int UNUSED (bg_pixmap)) { struct frame *f = XFRAME (w->frame); struct device *d = XDEVICE (f->device); @@ -1526,8 +1526,8 @@ ****************************************************************************/ void x_output_shadows (struct frame *f, int x, int y, int width, int height, - GC top_shadow_gc, GC bottom_shadow_gc, GC background_gc, - int shadow_thickness, int edges) + GC top_shadow_gc, GC bottom_shadow_gc, + GC UNUSED (background_gc), int shadow_thickness, int edges) { struct device *d = XDEVICE (f->device); @@ -1677,7 +1677,8 @@ given face. ****************************************************************************/ static void -x_clear_region (Lisp_Object locale, struct device* d, struct frame* f, face_index findex, +x_clear_region (Lisp_Object UNUSED (locale), struct device* d, + struct frame* f, face_index UNUSED (findex), int x, int y, int width, int height, Lisp_Object fcolor, Lisp_Object bcolor, Lisp_Object background_pixmap)
--- a/src/redisplay.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/redisplay.c Mon Sep 20 19:20:08 2004 +0000 @@ -3160,7 +3160,7 @@ /* Add a blank to a margin display block. */ static void -add_margin_blank (struct display_line *dl, struct display_block *db, +add_margin_blank (struct display_line *UNUSED (dl), struct display_block *db, struct window *w, int xpos, int width, int side) { struct rune rb; @@ -4071,7 +4071,7 @@ modeline extents. */ static Charcount add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph, - Charcount pos, Charcount min_pos, + Charcount pos, Charcount UNUSED (min_pos), Charcount max_pos, Lisp_Object extent) { /* This function has been Mule-ized. */ @@ -5897,7 +5897,7 @@ first_line = last_line = line; while (line <= dla_end) { - Charbpos old_start, old_end, new_start; + Charbpos old_start, old_end; struct display_line *cdl = Dynarr_atp (cdla, line); struct display_line *ddl = Dynarr_atp (ddla, line); struct display_block *db; @@ -5918,8 +5918,8 @@ if (line == first_line && ddl->used_prop_data) return 0; - new_start = generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset, - &prop, DESIRED_DISP); + generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset, + &prop, DESIRED_DISP); ddl->offset = 0; /* #### If there is propagated stuff the fail. We could @@ -6053,7 +6053,6 @@ we fail the next thing that is going to happen is a full regen so we will actually end up being safe. */ { - Charbpos new_start; prop_block_dynarr *prop = NULL; struct display_line *cdl = Dynarr_atp (cdla, line); struct display_line *ddl = Dynarr_atp (ddla, line); @@ -6070,8 +6069,8 @@ if (ddl->used_prop_data) return 0; - new_start = generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset, - &prop, DESIRED_DISP); + generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset, + &prop, DESIRED_DISP); ddl->offset = 0; /* If there is propagated stuff then it is pretty much a @@ -6666,7 +6665,7 @@ be a better way to do this. */ static int -reset_buffer_changes_mapfun (struct window *w, void *ignored_closure) +reset_buffer_changes_mapfun (struct window *w, void *UNUSED (closure)) { buffer_reset_changes (XBUFFER (w->buffer)); return 0; @@ -6745,7 +6744,7 @@ #ifdef ERROR_CHECK_TRAPPING_PROBLEMS static Lisp_Object -commit_ritual_suicide (Lisp_Object ceci_nest_pas_une_pipe) +commit_ritual_suicide (Lisp_Object UNUSED (ceci_nest_pas_une_pipe)) { assert (!in_display); return Qnil; @@ -6805,7 +6804,7 @@ static int in_display_nesting; static Lisp_Object -end_hold_frame_size_changes (Lisp_Object obj) +end_hold_frame_size_changes (Lisp_Object UNUSED (obj)) { if (!hold_frame_size_changes) { @@ -9599,7 +9598,7 @@ Force the modeline of the current buffer to be redisplayed. With optional non-nil ALL, force redisplay of all modelines. */ - (all)) + (UNUSED (all))) { MARK_MODELINE_CHANGED; return Qnil; @@ -9626,15 +9625,18 @@ /***************************************************************************/ static void -margin_width_changed_in_frame (Lisp_Object specifier, struct frame *f, - Lisp_Object oldval) +margin_width_changed_in_frame (Lisp_Object UNUSED (specifier), + struct frame *UNUSED (f), + Lisp_Object UNUSED (oldval)) { /* Nothing to be done? */ } int -redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val, - Lisp_Object in_object, int flags) +redisplay_variable_changed (Lisp_Object UNUSED (sym), + Lisp_Object *UNUSED (val), + Lisp_Object UNUSED (in_object), + int UNUSED (flags)) { /* #### clip_changed should really be renamed something like global_redisplay_change. */ @@ -9645,8 +9647,8 @@ /* This is called if the built-in glyphs have their properties changed. */ void -redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property, - Lisp_Object locale) +redisplay_glyph_changed (Lisp_Object UNUSED (glyph), + Lisp_Object UNUSED (property), Lisp_Object locale) { if (WINDOWP (locale)) { @@ -9677,8 +9679,8 @@ } static void -text_cursor_visible_p_changed (Lisp_Object specifier, struct window *w, - Lisp_Object oldval) +text_cursor_visible_p_changed (Lisp_Object UNUSED (specifier), + struct window *w, Lisp_Object UNUSED (oldval)) { if (XFRAME (w->frame)->init_finished) Fforce_cursor_redisplay (w->frame); @@ -9827,7 +9829,8 @@ #ifdef ERROR_CHECK_DISPLAY static int -sledgehammer_check_redisplay_structs_1 (struct window *w, void *closure) +sledgehammer_check_redisplay_structs_1 (struct window *w, + void *UNUSED (closure)) { int i, j; display_line_dynarr *dl;
--- a/src/regex.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/regex.c Mon Sep 20 19:20:08 2004 +0000 @@ -83,6 +83,8 @@ #else /* not emacs */ +#include "compiler.h" /* Get compiler-specific definitions like UNUSED */ + /* If we are not linking with Emacs proper, we can't use the relocating allocator even if config.h says that we can. */ @@ -6963,7 +6965,7 @@ from either regcomp or regexec. We don't use PREG here. */ size_t -regerror (int errcode, const regex_t *preg, char *errbuf, +regerror (int errcode, const regex_t *UNUSED (preg), char *errbuf, size_t errbuf_size) { const char *msg;
--- a/src/scrollbar-gtk.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/scrollbar-gtk.c Mon Sep 20 19:20:08 2004 +0000 @@ -75,7 +75,8 @@ } static gboolean -scrollbar_drag_hack_cb (GtkWidget *w, GdkEventButton *ev, gpointer v) +scrollbar_drag_hack_cb (GtkWidget *UNUSED (w), GdkEventButton *UNUSED (ev), + gpointer v) { vertical_drag_in_progress = (int) v; inhibit_slider_size_change = (int) v; @@ -472,7 +473,7 @@ #ifdef MEMORY_USAGE_STATS static int -gtk_compute_scrollbar_instance_usage (struct device *d, +gtk_compute_scrollbar_instance_usage (struct device *UNUSED (d), struct scrollbar_instance *inst, struct overhead_stats *ovstats) {
--- a/src/scrollbar-msw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/scrollbar-msw.c Mon Sep 20 19:20:08 2004 +0000 @@ -129,10 +129,10 @@ } static void -mswindows_update_scrollbar_instance_values (struct window *w, +mswindows_update_scrollbar_instance_values (struct window *UNUSED (w), struct scrollbar_instance *sb, - int new_line_increment, - int new_page_increment, + int UNUSED (new_line_increment), + int UNUSED (new_page_increment), int new_minimum, int new_maximum, int new_slider_size, int new_slider_position, @@ -184,8 +184,8 @@ } static void -mswindows_update_scrollbar_instance_status (struct window *w, - int active, int size, +mswindows_update_scrollbar_instance_status (struct window *UNUSED (w), + int UNUSED (active), int size, struct scrollbar_instance *sb) { if (SCROLLBAR_MSW_SIZE (sb) != size) @@ -199,7 +199,7 @@ } void -mswindows_handle_scrollbar_event (HWND hwnd, int code, int pos) +mswindows_handle_scrollbar_event (HWND hwnd, int code, int UNUSED (pos)) { struct frame *f; Lisp_Object win, frame; @@ -422,9 +422,9 @@ #ifdef MEMORY_USAGE_STATS static int -mswindows_compute_scrollbar_instance_usage (struct device *d, - struct scrollbar_instance *inst, - struct overhead_stats *ovstats) +mswindows_compute_scrollbar_instance_usage (struct device *UNUSED (d), + struct scrollbar_instance *inst, + struct overhead_stats *ovstats) { int total = 0;
--- a/src/scrollbar-x.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/scrollbar-x.c Mon Sep 20 19:20:08 2004 +0000 @@ -692,7 +692,7 @@ #ifdef MEMORY_USAGE_STATS static int -x_compute_scrollbar_instance_usage (struct device *d, +x_compute_scrollbar_instance_usage (struct device *UNUSED (d), struct scrollbar_instance *inst, struct overhead_stats *ovstats) {
--- a/src/scrollbar.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/scrollbar.c Mon Sep 20 19:20:08 2004 +0000 @@ -437,7 +437,9 @@ int new_minimum = -1, new_maximum = -1; int new_slider_size = -1, new_slider_position = -1; int new_width = -1, new_height = -1, new_x = -1, new_y = -1; +#if 0 struct window *new_window = 0; /* #### currently unused */ +#endif end_pos = BUF_Z (b) - w->window_end_pos[CURRENT_DISP]; sb_pos = scrollbar_point (w, 0); @@ -528,7 +530,9 @@ new_slider_size = min ((end_pos - start_pos), (new_maximum - new_minimum)); new_slider_position = sb_pos; +#if 0 new_window = w; +#endif } } else if (!MINI_WINDOW_P (w)) @@ -620,9 +624,9 @@ } static void -vertical_scrollbar_changed_in_window (Lisp_Object specifier, +vertical_scrollbar_changed_in_window (Lisp_Object UNUSED (specifier), struct window *w, - Lisp_Object oldval) + Lisp_Object UNUSED (oldval)) { /* Hold on your cerebella guys. If we always show the dividers, changing scrollbar affects only how the text and scrollbar are @@ -642,8 +646,9 @@ /* This function is called as a result of a change to the `scrollbar-pointer' glyph. */ static void -scrollbar_pointer_changed_in_window (Lisp_Object specifier, struct window *w, - Lisp_Object oldval) +scrollbar_pointer_changed_in_window (Lisp_Object UNUSED (specifier), + struct window *w, + Lisp_Object UNUSED (oldval)) { struct frame *f = XFRAME (WINDOW_FRAME (w));
--- a/src/search.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/search.c Mon Sep 20 19:20:08 2004 +0000 @@ -158,7 +158,7 @@ static int compile_pattern_1 (struct regexp_cache *cp, Lisp_Object pattern, - struct re_registers *regp, Lisp_Object translate, + struct re_registers *UNUSED (regp), Lisp_Object translate, int posix, Error_Behavior errb) { const char *val; @@ -197,8 +197,9 @@ struct re_pattern_buffer * compile_pattern (Lisp_Object pattern, struct re_registers *regp, - Lisp_Object translate, Lisp_Object searchobj, - struct buffer *searchbuf, int posix, Error_Behavior errb) + Lisp_Object translate, Lisp_Object UNUSED (searchobj), + struct buffer *UNUSED (searchbuf), int posix, + Error_Behavior errb) { struct regexp_cache *cp, **cpp; @@ -404,7 +405,7 @@ static Lisp_Object string_match_1 (Lisp_Object regexp, Lisp_Object string, Lisp_Object start, - struct buffer *buf, int posix) + struct buffer *buf, int UNUSED (posix)) { Bytecount val; Charcount s; @@ -3085,7 +3086,7 @@ #### Not yet implemented. Currently does nothing. #### Do not use this yet. Its calling interface is likely to change. */ - (regexp)) + (UNUSED (regexp))) { return Qnil; }
--- a/src/select-gtk.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/select-gtk.c Mon Sep 20 19:20:08 2004 +0000 @@ -49,7 +49,8 @@ extern Lisp_Object time_to_lisp (time_t); static GdkAtom -symbol_to_gtk_atom (struct device *d, Lisp_Object sym, int only_if_exists) +symbol_to_gtk_atom (struct device *UNUSED (d), Lisp_Object sym, + int only_if_exists) { if (NILP (sym)) return GDK_SELECTION_PRIMARY; if (EQ (sym, Qt)) return GDK_SELECTION_SECONDARY; @@ -64,7 +65,7 @@ } static Lisp_Object -atom_to_symbol (struct device *d, GdkAtom atom) +atom_to_symbol (struct device *UNUSED (d), GdkAtom atom) { if (atom == GDK_SELECTION_PRIMARY) return (QPRIMARY); if (atom == GDK_SELECTION_SECONDARY) return (QSECONDARY); @@ -129,11 +130,11 @@ ** WMP Feb 12 2001 */ void -emacs_gtk_selection_handle (GtkWidget *widget, +emacs_gtk_selection_handle (GtkWidget *UNUSED (widget), GtkSelectionData *selection_data, - guint info, + guint UNUSED (info), guint time_stamp, - gpointer data) + gpointer UNUSED (data)) { /* This function can GC */ struct gcpro gcpro1, gcpro2; @@ -241,9 +242,9 @@ void -emacs_gtk_selection_clear_event_handle (GtkWidget *widget, +emacs_gtk_selection_clear_event_handle (GtkWidget *UNUSED (widget), GdkEventSelection *event, - gpointer data) + gpointer UNUSED (data)) { GdkAtom selection = event->selection; guint32 changed_owner_time = event->time; @@ -281,9 +282,9 @@ /* Gets the current selection owned by another application */ void -emacs_gtk_selection_received (GtkWidget *widget, +emacs_gtk_selection_received (GtkWidget *UNUSED (widget), GtkSelectionData *selection_data, - gpointer user_data) + gpointer UNUSED (user_data)) { waiting_for_selection = FALSE; Vretrieved_selection = Qnil; @@ -306,7 +307,7 @@ } static int -selection_reply_done (void *ignore) +selection_reply_done (void *UNUSED (ignore)) { return !reading_selection_reply; } @@ -404,8 +405,10 @@ static Lisp_Object -gtk_own_selection (Lisp_Object selection_name, Lisp_Object selection_value, - Lisp_Object how_to_add, Lisp_Object selection_type, int owned_p) +gtk_own_selection (Lisp_Object selection_name, + Lisp_Object UNUSED (selection_value), + Lisp_Object UNUSED (how_to_add), + Lisp_Object UNUSED (selection_type), int UNUSED (owned_p)) { struct device *d = decode_gtk_device (Qnil); GtkWidget *selecting_window = GTK_WIDGET (DEVICE_GTK_APP_SHELL (d)); @@ -459,7 +462,7 @@ static Lisp_Object gtk_selection_exists_p (Lisp_Object selection, - Lisp_Object selection_type) + Lisp_Object UNUSED (selection_type)) { struct device *d = decode_gtk_device (Qnil);
--- a/src/select-msw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/select-msw.c Mon Sep 20 19:20:08 2004 +0000 @@ -227,7 +227,7 @@ Lisp_Object selection_value, Lisp_Object how_to_add, Lisp_Object selection_type, - int owned_p /* Not used */) + int UNUSED (owned_p)) { HGLOBAL hValue = NULL; UINT cfType; @@ -584,7 +584,8 @@ } static void -mswindows_disown_selection (Lisp_Object selection, Lisp_Object timeval) +mswindows_disown_selection (Lisp_Object selection, + Lisp_Object UNUSED (timeval)) { if (EQ (selection, QCLIPBOARD)) {
--- a/src/select-x.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/select-x.c Mon Sep 20 19:20:08 2004 +0000 @@ -203,9 +203,20 @@ /* Do protocol to assert ourself as a selection owner. */ static Lisp_Object -x_own_selection (Lisp_Object selection_name, Lisp_Object selection_value, - Lisp_Object how_to_add, Lisp_Object selection_type, - int owned_p) +x_own_selection (Lisp_Object selection_name, +#ifdef MOTIF_CLIPBOARDS + Lisp_Object selection_value, +#else + Lisp_Object UNUSED (selection_value), +#endif + Lisp_Object UNUSED (how_to_add), + Lisp_Object UNUSED (selection_type), +#ifdef MOTIF_CLIPBOARDS + int owned_p +#else + int UNUSED (owned_p) +#endif +) { struct device *d = decode_x_device (Qnil); Display *display = DEVICE_X_DISPLAY (d); @@ -881,7 +892,7 @@ static int selection_reply_timed_out; static int -selection_reply_done (void *ignore) +selection_reply_done (void *UNUSED (unused)) { return !reading_selection_reply; } @@ -891,7 +902,7 @@ DEFUN ("x-selection-reply-timeout-internal", Fx_selection_reply_timeout_internal, 1, 1, 0, /* */ - (arg)) + (UNUSED (arg))) { selection_reply_timed_out = 1; reading_selection_reply = 0; @@ -1028,7 +1039,7 @@ static void receive_incremental_selection (Display *display, Window window, Atom property, /* this one is for error messages only */ - Lisp_Object target_type, + Lisp_Object UNUSED (target_type), Bytecount min_size_bytes, UChar_Binary **data_ret, Bytecount *size_bytes_ret, @@ -1203,7 +1214,7 @@ static Lisp_Object x_selection_exists_p (Lisp_Object selection, - Lisp_Object selection_type) + Lisp_Object UNUSED (selection_type)) { struct device *d = decode_x_device (Qnil); Display *dpy = DEVICE_X_DISPLAY (d);
--- a/src/sgiplay.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/sgiplay.c Mon Sep 20 19:20:08 2004 +0000 @@ -316,7 +316,7 @@ } static int -play_internal (UChar_Binary *data, int length, AudioContext ac) +play_internal (UChar_Binary *data, int UNUSED (length), AudioContext ac) { UChar_Binary * limit; if (ac == (AudioContext) 0)
--- a/src/signal.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/signal.c Mon Sep 20 19:20:08 2004 +0000 @@ -463,7 +463,7 @@ /* Signal handler for SIGIO. */ static void -input_available_signal (int signo) +input_available_signal (int SIG_ARG_MAYBE_UNUSED (signo)) { something_happened = 1; /* tell QUIT to wake up */ quit_check_signal_happened = 1;
--- a/src/sound.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/sound.c Mon Sep 20 19:20:08 2004 +0000 @@ -493,8 +493,13 @@ DEFUN ("wait-for-sounds", Fwait_for_sounds, 0, 1, 0, /* Wait for all sounds to finish playing on DEVICE. */ - (device)) - + ( +#ifdef HAVE_NAS_SOUND + device +#else + UNUSED (device) +#endif + )) { #ifdef HAVE_NAS_SOUND struct device *d = decode_device (device); @@ -510,7 +515,13 @@ DEFUN ("connected-to-nas-p", Fconnected_to_nas_p, 0, 1, 0, /* Return t if connected to NAS server for sounds on DEVICE. */ - (device)) + ( +#ifdef HAVE_NAS_SOUND + device +#else + UNUSED (device) +#endif + )) { #ifdef HAVE_NAS_SOUND return DEVICE_CONNECTED_TO_NAS_P (decode_device (device)) ? Qt : Qnil;
--- a/src/specifier.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/specifier.c Mon Sep 20 19:20:08 2004 +0000 @@ -263,7 +263,8 @@ } static void -print_specifier (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_specifier (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { Lisp_Specifier *sp = XSPECIFIER (obj); int count = specpdl_depth (); @@ -2186,7 +2187,7 @@ enum spec_locale_type locale_type, Lisp_Object tag_set, int exact_p, - void *ignored_closure) + void *UNUSED (closure)) { if (NILP (locale)) specifier_remove_locale_type (specifier, locale_type, tag_set, exact_p); @@ -2547,7 +2548,6 @@ Lisp_Object window = Qnil; Lisp_Object frame = Qnil; Lisp_Object device = Qnil; - Lisp_Object tag = Qnil; /* #### currently unused */ Lisp_Specifier *sp = XSPECIFIER (specifier); /* Attempt to determine buffer, window, frame, and device from the @@ -2579,7 +2579,7 @@ device = FRAME_DEVICE (XFRAME (frame)); /* device had better be determined by now; abort if not. */ - tag = DEVICE_CLASS (XDEVICE (device)); + (void) DEVICE_CLASS (XDEVICE (device)); depth = make_int (1 + XINT (depth)); if (XINT (depth) > 20)
--- a/src/sunpro.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/sunpro.c Mon Sep 20 19:20:08 2004 +0000 @@ -46,7 +46,11 @@ function has no effect and always returns `nil'. See function `has-usage-tracking-p'. */ - (int nargs, Lisp_Object *args)) +#ifdef USAGE_TRACKING + (int nargs, Lisp_Object *args) +#else + (int UNUSED (nargs), Lisp_Object *UNUSED (args)) +#endif { #ifdef USAGE_TRACKING Lisp_Object xs;
--- a/src/symbols.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/symbols.c Mon Sep 20 19:20:08 2004 +0000 @@ -995,8 +995,8 @@ /* Should never, ever be called. (except by an external debugger) */ void -print_symbol_value_magic (Lisp_Object obj, - Lisp_Object printcharfun, int escapeflag) +print_symbol_value_magic (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { write_fmt_string (printcharfun, "#<INTERNAL OBJECT (XEmacs bug?) (%s type %d) 0x%lx>", @@ -1323,7 +1323,7 @@ */ static void -write_out_buffer_local_cache (Lisp_Object symbol, +write_out_buffer_local_cache (Lisp_Object UNUSED (symbol), struct symbol_value_buffer_local *bfwd) { if (!NILP (bfwd->current_buffer)) @@ -2998,7 +2998,8 @@ this function (or change the semantics of its arguments) without pity, thereby invalidating your code. */ - (variable, handler_type, handler, harg, keep_existing)) + (variable, handler_type, handler, harg, + UNUSED (keep_existing))) { Lisp_Object valcontents; struct symbol_value_lisp_magic *bfwd;
--- a/src/syntax.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/syntax.c Mon Sep 20 19:20:08 2004 +0000 @@ -458,7 +458,8 @@ outward to the current buffer (#### rewrite in English please?!). */ void -update_syntax_cache (struct syntax_cache *cache, Charxpos cpos, int count) +update_syntax_cache (struct syntax_cache *cache, Charxpos cpos, + int UNUSED (count)) { Lisp_Object tmp_table; Bytexpos pos; @@ -615,7 +616,8 @@ #ifdef MULE enum syntaxcode -charset_syntax (struct buffer *buf, Lisp_Object charset, int *multi_p_out) +charset_syntax (struct buffer *UNUSED (buf), Lisp_Object UNUSED (charset), + int *multi_p_out) { *multi_p_out = 1; /* !!#### get this right */ @@ -2234,7 +2236,7 @@ */ static int -copy_to_mirrortab (struct chartab_range *range, Lisp_Object table, +copy_to_mirrortab (struct chartab_range *range, Lisp_Object UNUSED (table), Lisp_Object val, void *arg) { Lisp_Object mirrortab = VOID_TO_LISP (arg); @@ -2247,7 +2249,8 @@ } static int -copy_if_not_already_present (struct chartab_range *range, Lisp_Object table, +copy_if_not_already_present (struct chartab_range *range, + Lisp_Object UNUSED (table), Lisp_Object val, void *arg) { Lisp_Object mirrortab = VOID_TO_LISP (arg);
--- a/src/sysdep.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/sysdep.c Mon Sep 20 19:20:08 2004 +0000 @@ -367,7 +367,13 @@ */ void -flush_pending_output (int channel) +flush_pending_output ( +#if !defined (HAVE_TERMIOS) && (defined (TCFLSH) || defined (TIOCFLUSH)) + int channel +#else + int UNUSED (channel) +#endif + ) { #ifdef HAVE_TERMIOS /* If we try this, we get hit with SIGTTIN, because @@ -1479,11 +1485,16 @@ tty_init_sys_modes_on_device (struct device *d) { struct emacs_tty tty; - int input_fd, output_fd; + int input_fd; +#if defined (IBMR2AIX) && defined (AIXHFT) + int output_fd; +#endif struct console *con = XCONSOLE (DEVICE_CONSOLE (d)); input_fd = CONSOLE_TTY_DATA (con)->infd; +#if defined (IBMR2AIX) && defined (AIXHFT) output_fd = CONSOLE_TTY_DATA (con)->outfd; +#endif emacs_get_tty (input_fd, &CONSOLE_TTY_DATA (con)->old_tty); tty = CONSOLE_TTY_DATA (con)->old_tty; @@ -1863,11 +1874,16 @@ static void tty_reset_sys_modes_on_device (struct device *d) { - int input_fd, output_fd; +#if defined (BSD) || (defined (IBMR2AIX) && defined (AIXHFT)) + int output_fd; +#endif + int input_fd; struct console *con = XCONSOLE (DEVICE_CONSOLE (d)); input_fd = CONSOLE_TTY_DATA (con)->infd; +#if defined (BSD) || (defined (IBMR2AIX) && defined (AIXHFT)) output_fd = CONSOLE_TTY_DATA (con)->outfd; +#endif #if defined (IBMR2AIX) && defined (AIXHFT) {
--- a/src/sysproc.h Mon Sep 20 19:11:29 2004 +0000 +++ b/src/sysproc.h Mon Sep 20 19:20:08 2004 +0000 @@ -152,6 +152,17 @@ #include <util.h> /* openpty() on NetBSD */ #endif +/* The FD_* macros expand to __extension__ forms on glibc-based systems. Uno + does not understand such forms, so let's help it out. */ +#ifdef UNO +#undef FD_SET +#undef FD_CLR +#undef FD_ISSET +#undef FD_ZERO +#undef MAXDESC +#undef SELECT_TYPE +#endif /* UNO */ + #ifdef FD_SET /* We could get this from param.h, but better not to depend on finding that.
--- a/src/syssignal.h Mon Sep 20 19:11:29 2004 +0000 +++ b/src/syssignal.h Mon Sep 20 19:20:08 2004 +0000 @@ -148,6 +148,7 @@ sigsuspend (&ES_mask); \ } while (0) #define EMACS_REESTABLISH_SIGNAL(sig, handler) +#define SIG_ARG_MAYBE_UNUSED(decl) UNUSED (decl) #elif defined (HAVE_SIGBLOCK) @@ -173,6 +174,7 @@ sigpause (ES_mask & ~sigmask (sig)); \ } while (0) #define EMACS_REESTABLISH_SIGNAL(sig, handler) +#define SIG_ARG_MAYBE_UNUSED(decl) UNUSED (decl) #elif defined (HAVE_SIGHOLD) @@ -188,6 +190,7 @@ #define EMACS_UNBLOCK_ALL_SIGNALS() 0 #define EMACS_WAIT_FOR_SIGNAL(sig) sigpause (sig) #define EMACS_REESTABLISH_SIGNAL(sig, handler) +#define SIG_ARG_MAYBE_UNUSED(decl) UNUSED (decl) #elif defined (WIN32_NATIVE) @@ -203,6 +206,7 @@ #define EMACS_UNBLOCK_ALL_SIGNALS() 0 #define EMACS_WAIT_FOR_SIGNAL(sig) mswindows_sigpause (sig) #define EMACS_REESTABLISH_SIGNAL(sig, handler) +#define SIG_ARG_MAYBE_UNUSED(decl) UNUSED (decl) /* Defines that we need that aren't in the standard signal.h */ #define SIGHUP 1 /* Hang up */ @@ -227,6 +231,7 @@ signal (sig, handler); \ errno = old_errno; \ } while (0) +#define SIG_ARG_MAYBE_UNUSED(decl) decl /* Under SYSV, setting a signal handler for SIGCLD causes SIGCLD to immediately be sent if there any unwaited processes
--- a/src/syswait.h Mon Sep 20 19:11:29 2004 +0000 +++ b/src/syswait.h Mon Sep 20 19:20:08 2004 +0000 @@ -28,6 +28,19 @@ #include <sys/wait.h> #endif +#ifdef UNO +/* On glibc-based systems, these macros expand to forms containing + __extension__, which Uno cannot understand. */ +#undef WEXITSTATUS +#undef WIFEXITED +#undef WIFSTOPPED +#undef WIFSIGNALED +#undef WCOREDUMP +#undef WTERMSIG +#undef WSTOPSIG +#undef WRETCODE +#endif + #ifndef WEXITSTATUS #define WEXITSTATUS(s) ((s) >> 8) #endif
--- a/src/terminfo.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/terminfo.c Mon Sep 20 19:20:08 2004 +0000 @@ -66,7 +66,7 @@ /* XEmacs: renamed this function because just tparam() conflicts with ncurses (We don't use this function anyway!) */ char * -emacs_tparam (const char *string, char *outstring, int len, int arg1, +emacs_tparam (const char *string, char *outstring, int UNUSED (len), int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
--- a/src/tests.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/tests.c Mon Sep 20 19:20:08 2004 +0000 @@ -407,7 +407,7 @@ static int -test_hash_tables_mapper (Lisp_Object key, Lisp_Object value, +test_hash_tables_mapper (Lisp_Object UNUSED (key), Lisp_Object value, void *extra_arg) { test_hash_tables_data *p = (test_hash_tables_data *) extra_arg; @@ -428,8 +428,9 @@ } static int -test_hash_tables_predicate (Lisp_Object key, Lisp_Object value, - void *extra_arg) +test_hash_tables_predicate (Lisp_Object key, + Lisp_Object UNUSED (value), + void *UNUSED (extra_arg)) { return XINT (key) < 0; }
--- a/src/text.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/text.c Mon Sep 20 19:20:08 2004 +0000 @@ -1503,7 +1503,7 @@ Ibyte * eicpyout_malloc_fmt (Eistring *eistr, Bytecount *len_out, Internal_Format fmt, - Lisp_Object object) + Lisp_Object UNUSED (object)) { Ibyte *ptr;
--- a/src/text.h Mon Sep 20 19:11:29 2004 +0000 +++ b/src/text.h Mon Sep 20 19:20:08 2004 +0000 @@ -275,7 +275,8 @@ DECLARE_INLINE_HEADER ( Raw_Ichar -ichar_to_raw (Ichar ch, Internal_Format fmt, Lisp_Object object) +ichar_to_raw (Ichar ch, Internal_Format fmt, + Lisp_Object UNUSED (object)) ) { switch (fmt) @@ -299,7 +300,8 @@ DECLARE_INLINE_HEADER ( int -ichar_fits_in_format (Ichar ch, Internal_Format fmt, Lisp_Object object) +ichar_fits_in_format (Ichar ch, Internal_Format fmt, + Lisp_Object UNUSED (object)) ) { switch (fmt) @@ -321,8 +323,8 @@ DECLARE_INLINE_HEADER ( int -objects_have_same_internal_representation (Lisp_Object srcobj, - Lisp_Object dstobj) +objects_have_same_internal_representation (Lisp_Object UNUSED (srcobj), + Lisp_Object UNUSED (dstobj)) ) { /* &&#### implement this properly when we allow per-object format @@ -833,7 +835,7 @@ DECLARE_INLINE_HEADER ( Ichar itext_ichar_fmt (const Ibyte *ptr, Internal_Format fmt, - Lisp_Object object) + Lisp_Object UNUSED (object)) ) { switch (fmt) @@ -863,7 +865,7 @@ DECLARE_INLINE_HEADER ( Ichar itext_ichar_ascii_fmt (const Ibyte *ptr, Internal_Format fmt, - Lisp_Object object) + Lisp_Object UNUSED (object)) ) { switch (fmt) @@ -929,7 +931,7 @@ DECLARE_INLINE_HEADER ( Bytecount set_itext_ichar_fmt (Ibyte *ptr, Ichar x, Internal_Format fmt, - Lisp_Object object) + Lisp_Object UNUSED (object)) ) { switch (fmt)
--- a/src/toolbar-gtk.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/toolbar-gtk.c Mon Sep 20 19:20:08 2004 +0000 @@ -44,14 +44,14 @@ static void -gtk_initialize_frame_toolbars (struct frame *f) +gtk_initialize_frame_toolbars (struct frame *UNUSED (f)) { } /* This only calls one function but we go ahead and create this in case we ever do decide that we need to do more work. */ static void -gtk_free_frame_toolbars (struct frame *f) +gtk_free_frame_toolbars (struct frame *UNUSED (f)) { }
--- a/src/toolbar-msw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/toolbar-msw.c Mon Sep 20 19:20:08 2004 +0000 @@ -84,7 +84,7 @@ static int allocate_toolbar_item_id (struct frame *f, struct toolbar_button *button, - enum toolbar_pos pos) + enum toolbar_pos UNUSED (pos)) { /* hmm what do we generate an id based on */ int id = TOOLBAR_ITEM_ID_BITS (internal_hash (button->callback, 0)); @@ -98,7 +98,7 @@ static void mswindows_clear_toolbar (struct frame *f, enum toolbar_pos pos, - int thickness_change) + int UNUSED (thickness_change)) { HIMAGELIST ilist = NULL; int i; @@ -513,8 +513,9 @@ } static void -mswindows_redraw_exposed_toolbars (struct frame *f, int x, int y, int width, - int height) +mswindows_redraw_exposed_toolbars (struct frame *f, + int UNUSED (x), int UNUSED (y), + int UNUSED (width), int UNUSED (height)) { assert (FRAME_MSWINDOWS_P (f)); @@ -539,7 +540,7 @@ } static void -mswindows_initialize_frame_toolbars (struct frame *f) +mswindows_initialize_frame_toolbars (struct frame *UNUSED (f)) { } @@ -616,7 +617,8 @@ * command if we return nil */ Lisp_Object -mswindows_handle_toolbar_wm_command (struct frame *f, HWND ctrl, WORD id) +mswindows_handle_toolbar_wm_command (struct frame *f, HWND UNUSED (ctrl), + WORD id) { /* Try to map the command id through the proper hash table */ Lisp_Object button, data, fn, arg, frame;
--- a/src/toolbar-x.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/toolbar-x.c Mon Sep 20 19:20:08 2004 +0000 @@ -65,7 +65,7 @@ /* This only calls one function but we go ahead and create this in case we ever do decide that we need to do more work. */ static void -x_free_frame_toolbars (struct frame *f) +x_free_frame_toolbars (struct frame *UNUSED (unused)) { }
--- a/src/toolbar.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/toolbar.c Mon Sep 20 19:20:08 2004 +0000 @@ -1192,7 +1192,8 @@ } static void -toolbar_after_change (Lisp_Object specifier, Lisp_Object locale) +toolbar_after_change (Lisp_Object UNUSED (specifier), + Lisp_Object UNUSED (locale)) { /* #### This is overkill. I really need to rethink the after-change functions to make them easier to use. */ @@ -1223,8 +1224,9 @@ } static void -toolbar_specs_changed (Lisp_Object specifier, struct window *w, - Lisp_Object oldval) +toolbar_specs_changed (Lisp_Object UNUSED (specifier), + struct window *UNUSED (w), + Lisp_Object UNUSED (oldval)) { /* This could be smarter but I doubt that it would make any noticeable difference given the infrequency with which this is @@ -1234,69 +1236,74 @@ } static void -default_toolbar_specs_changed (Lisp_Object specifier, struct window *w, - Lisp_Object oldval) +default_toolbar_specs_changed (Lisp_Object UNUSED (specifier), + struct window *UNUSED (w), + Lisp_Object UNUSED (oldval)) { recompute_overlaying_specifier (Vtoolbar); } static void -default_toolbar_size_changed_in_frame (Lisp_Object specifier, struct frame *f, - Lisp_Object oldval) +default_toolbar_size_changed_in_frame (Lisp_Object UNUSED (specifier), + struct frame *UNUSED (f), + Lisp_Object UNUSED (oldval)) { recompute_overlaying_specifier (Vtoolbar_size); } static void -default_toolbar_border_width_changed_in_frame (Lisp_Object specifier, - struct frame *f, - Lisp_Object oldval) +default_toolbar_border_width_changed_in_frame (Lisp_Object UNUSED (specifier), + struct frame *UNUSED (f), + Lisp_Object UNUSED (oldval)) { recompute_overlaying_specifier (Vtoolbar_border_width); } static void -default_toolbar_visible_p_changed_in_frame (Lisp_Object specifier, - struct frame *f, - Lisp_Object oldval) +default_toolbar_visible_p_changed_in_frame (Lisp_Object UNUSED (specifier), + struct frame *UNUSED (f), + Lisp_Object UNUSED (oldval)) { recompute_overlaying_specifier (Vtoolbar_visible_p); } static void -toolbar_geometry_changed_in_window (Lisp_Object specifier, struct window *w, - Lisp_Object oldval) +toolbar_geometry_changed_in_window (Lisp_Object UNUSED (specifier), + struct window *w, + Lisp_Object UNUSED (oldval)) { MARK_TOOLBAR_CHANGED; MARK_WINDOWS_CHANGED (w); } static void -default_toolbar_size_changed_in_window (Lisp_Object specifier, struct window *w, - Lisp_Object oldval) +default_toolbar_size_changed_in_window (Lisp_Object UNUSED (specifier), + struct window *UNUSED (w), + Lisp_Object UNUSED (oldval)) { recompute_overlaying_specifier (Vtoolbar_size); } static void -default_toolbar_border_width_changed_in_window (Lisp_Object specifier, - struct window *w, - Lisp_Object oldval) +default_toolbar_border_width_changed_in_window (Lisp_Object UNUSED (specifier), + struct window *UNUSED (w), + Lisp_Object UNUSED (oldval)) { recompute_overlaying_specifier (Vtoolbar_border_width); } static void -default_toolbar_visible_p_changed_in_window (Lisp_Object specifier, - struct window *w, - Lisp_Object oldval) +default_toolbar_visible_p_changed_in_window (Lisp_Object UNUSED (specifier), + struct window *UNUSED (w), + Lisp_Object UNUSED (oldval)) { recompute_overlaying_specifier (Vtoolbar_visible_p); } static void -toolbar_buttons_captioned_p_changed (Lisp_Object specifier, struct window *w, - Lisp_Object oldval) +toolbar_buttons_captioned_p_changed (Lisp_Object UNUSED (specifier), + struct window *UNUSED (w), + Lisp_Object UNUSED (oldval)) { /* This could be smarter but I doubt that it would make any noticeable difference given the infrequency with which this is @@ -1305,8 +1312,9 @@ } static void -toolbar_shadows_changed (Lisp_Object specifier, struct window *w, - Lisp_Object oldval) +toolbar_shadows_changed (Lisp_Object UNUSED (specifier), + struct window *w, + Lisp_Object UNUSED (oldval)) { struct frame *f = XFRAME (w->frame);
--- a/src/tooltalk.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/tooltalk.c Mon Sep 20 19:20:08 2004 +0000 @@ -167,7 +167,7 @@ static void print_tooltalk_message (Lisp_Object obj, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { Lisp_Tooltalk_Message *p = XTOOLTALK_MESSAGE (obj); @@ -245,7 +245,7 @@ static void print_tooltalk_pattern (Lisp_Object obj, Lisp_Object printcharfun, - int escapeflag) + int UNUSED (escapeflag)) { Lisp_Tooltalk_Pattern *p = XTOOLTALK_PATTERN (obj); @@ -323,7 +323,7 @@ Run tt_message_receive(). This function is the process handler for the ToolTalk connection process. */ - (ignore1, ignore2)) + (UNUSED (ignore1), UNUSED (ignore2))) { /* This function can GC */ Tt_message mess = tt_message_receive ();
--- a/src/ui-byhand.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/ui-byhand.c Mon Sep 20 19:20:08 2004 +0000 @@ -468,7 +468,7 @@ } static void -__generic_toolbar_callback (GtkWidget *item, gpointer user_data) +__generic_toolbar_callback (GtkWidget *UNUSED (item), gpointer user_data) { Lisp_Object callback; Lisp_Object lisp_user_data;
--- a/src/ui-gtk.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/ui-gtk.c Mon Sep 20 19:20:08 2004 +0000 @@ -318,7 +318,8 @@ } static void -ffi_object_printer (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +ffi_object_printer (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { if (print_readably) printing_unreadable_object ("#<ffi %p>", XFFI (obj)->function_ptr); @@ -505,7 +506,8 @@ void **storage; }; -static void __dll_mapper (gpointer key, gpointer value, gpointer user_data) +static void __dll_mapper (gpointer UNUSED (key), gpointer value, + gpointer user_data) { struct __dll_mapper_closure *closure = (struct __dll_mapper_closure *) user_data; @@ -786,7 +788,8 @@ /* GtkObject wrapping for Lisp */ static void -emacs_gtk_object_printer (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +emacs_gtk_object_printer (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { if (print_readably) printing_unreadable_object ("#<GtkObject %p>", XGTK_OBJECT (obj)->object); @@ -969,7 +972,7 @@ lisp_to_gtk_type() routine to defend against passing dead objects to GTK routines. */ static void -__notice_object_destruction (GtkObject *obj, gpointer user_data) +__notice_object_destruction (GtkObject *UNUSED (obj), gpointer user_data) { ungcpro_popup_callbacks ((GUI_ID) user_data); } @@ -1104,7 +1107,8 @@ }; static void -emacs_gtk_boxed_printer (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +emacs_gtk_boxed_printer (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { if (print_readably) printing_unreadable_object ("#<GtkBoxed %p>", XGTK_BOXED (obj)->object); @@ -1115,7 +1119,7 @@ } static int -emacs_gtk_boxed_equality (Lisp_Object o1, Lisp_Object o2, int depth) +emacs_gtk_boxed_equality (Lisp_Object o1, Lisp_Object o2, int UNUSED (depth)) { emacs_gtk_boxed_data *data1 = XGTK_BOXED(o1); emacs_gtk_boxed_data *data2 = XGTK_BOXED(o2); @@ -1125,7 +1129,7 @@ } static unsigned long -emacs_gtk_boxed_hash (Lisp_Object obj, int depth) +emacs_gtk_boxed_hash (Lisp_Object obj, int UNUSED (depth)) { emacs_gtk_boxed_data *data = XGTK_BOXED(obj); return (HASH2 ((unsigned long)data->object, data->object_type));
--- a/src/unexaix.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexaix.c Mon Sep 20 19:20:08 2004 +0000 @@ -197,7 +197,7 @@ static int make_hdr (int new, int a_out, unsigned data_start, unsigned bss_start, - unsigned entry_address, + unsigned UNUSED (entry_address), char *a_name, char *new_name) { int scns; @@ -535,7 +535,7 @@ } static int -adjust_lnnoptrs (int writedesc, int readdesc, char *new_name) +adjust_lnnoptrs (int UNUSED (writedesc), int UNUSED (readdesc), char *new_name) { int nsyms; int naux;
--- a/src/unexalpha.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexalpha.c Mon Sep 20 19:20:08 2004 +0000 @@ -37,6 +37,7 @@ #include <aouthdr.h> #include <scnhdr.h> #include <syms.h> +#include "compiler.h" static void fatal_unexec (char *, char *); static void mark_x (char *); @@ -92,7 +93,7 @@ int unexec (char *new_name, char *a_name, unsigned long data_start, - unsigned long bss_start, + unsigned long UNUSED (bss_start), unsigned long entry_address) { int new, old;
--- a/src/unexconvex.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexconvex.c Mon Sep 20 19:20:08 2004 +0000 @@ -180,6 +180,8 @@ #include <machine/scnhdr.h> #include <machine/pte.h> +#include "compiler.h" + static long block_copy_start; /* Old executable start point */ static struct filehdr f_hdr; /* File header */ static struct opthdr f_ohdr; /* Optional file header (a.out) */ @@ -266,7 +268,8 @@ static int make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name) int new, a_out; - unsigned data_start, bss_start, entry_address; + unsigned data_start, bss_start; + unsigned UNUSED (entry_address); char *a_name; char *new_name; {
--- a/src/unexcw.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexcw.c Mon Sep 20 19:20:08 2004 +0000 @@ -97,8 +97,8 @@ /* Dump out .data and .bss sections into a new executable. */ int -unexec (char *out_name, char *in_name, uintptr_t start_data, - uintptr_t d1, uintptr_t d2) +unexec (char *out_name, char *in_name, uintptr_t UNUSED (start_data), + uintptr_t UNUSED (d1), uintptr_t UNUSED (d2)) { /* ugly nt hack - should be in lisp */ int a_new, a_out = -1;
--- a/src/unexec.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexec.c Mon Sep 20 19:20:08 2004 +0000 @@ -220,6 +220,8 @@ #include <fcntl.h> #endif +#include "compiler.h" + #ifndef O_RDONLY #define O_RDONLY 0 #endif @@ -227,7 +229,6 @@ #define O_RDWR 2 #endif - extern char *start_of_text (); /* Start of text */ extern void *start_of_data (); /* Start of initialized data */ @@ -812,7 +813,13 @@ * Copy the text and data segments from memory to the new a.out */ static int -copy_text_and_data (int new, int a_out) +copy_text_and_data (int new, +#if defined (COFF) && defined (USG_SHARED_LIBRARIES) + int a_out +#else + int UNUSED (a_out) +#endif + ) { char *end; char *ptr; @@ -1154,8 +1161,8 @@ int adjust_lnnoptrs (writedesc, readdesc, new_name) - int writedesc; - int readdesc; + int UNUSED (writedesc); + int UNUSED (readdesc); char *new_name; { int nsyms;
--- a/src/unexelf.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexelf.c Mon Sep 20 19:20:08 2004 +0000 @@ -436,6 +436,8 @@ #include <sym.h> /* for HDRR declaration */ #endif /* __sgi */ +#include "compiler.h" + #if defined (__alpha__) && !defined (__NetBSD__) && !defined (__OpenBSD__) /* Declare COFF debugging symbol table. This used to be in /usr/include/sym.h, but this file is no longer included in Red Hat @@ -556,8 +558,8 @@ void unexec (char *new_name, char *old_name, unsigned int data_start, unsigned int bss_start, unsigned int entry_address); void -unexec (char *new_name, char *old_name, unsigned int data_start, - unsigned int bss_start, unsigned int entry_address) +unexec (char *new_name, char *old_name, unsigned int UNUSED (data_start), + unsigned int UNUSED (bss_start), unsigned int UNUSED (entry_address)) { int new_file, old_file, new_file_size;
--- a/src/unexelfsgi.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexelfsgi.c Mon Sep 20 19:20:08 2004 +0000 @@ -100,6 +100,8 @@ # include <link.h> /* get ElfW etc */ #endif +#include "compiler.h" + #ifndef ElfW # ifdef __STDC__ # define ElfBitsW(bits, type) Elf##bits##_##type @@ -197,9 +199,9 @@ void unexec (char *new_name, char *old_name, - uintptr_t data_start, - uintptr_t bss_start, - uintptr_t entry_address) + uintptr_t UNUSED (data_start), + uintptr_t UNUSED (bss_start), + uintptr_t UNUSED (entry_address)) { int old_file;
--- a/src/unexencap.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexencap.c Mon Sep 20 19:20:08 2004 +0000 @@ -15,6 +15,7 @@ #include <sys/file.h> #include <stdio.h> #include "/usr/gnu/lib/gcc/gcc-include/a.out.h" +#include "compiler.h" filecpy(to, from, n) FILE *to, *from; @@ -41,7 +42,9 @@ * ****************************************************************/ unexec (new_name, a_name, data_start, bss_start, entry_address) char *new_name, *a_name; -unsigned data_start, bss_start, entry_address; +unsigned UNUSED (data_start); +unsigned UNUSED (bss_start); +unsigned UNUSED (entry_address); { struct coffheader header1; struct coffscn *tp, *dp, *bp;
--- a/src/unexenix.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexenix.c Mon Sep 20 19:20:08 2004 +0000 @@ -44,6 +44,7 @@ #include <stdio.h> #include <varargs.h> #include <a.out.h> +#include "compiler.h" static void fatal_unexec (); @@ -72,14 +73,16 @@ /* Should check the magic number of the old executable; not yet written. */ check_exec (x) - struct xexec *x; + struct xexec *UNUSED (x); { } unexec (new_name, a_name, data_start, bss_start, entry_address) char *new_name, *a_name; - unsigned data_start, bss_start, entry_address; + unsigned UNUSED (data_start); + unsigned UNUSED (bss_start); + unsigned UNUSED (entry_address); { char *sbrk (), *datalim = sbrk (0), *data_org; long segpos, textseen, textpos, textlen, datapos, datadiff, datalen;
--- a/src/unexfreebsd.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexfreebsd.c Mon Sep 20 19:20:08 2004 +0000 @@ -47,6 +47,7 @@ #include <stab.h> #include <sys/dir.h> #include <link.h> +#include "compiler.h" /********************** Macros *************************************/ @@ -492,8 +493,8 @@ static void *dynamic_addr = (void *) &_DYNAMIC; int -unexec (char *new_name, char *old_name, - unsigned int emacs_edata, unsigned int dummy1, unsigned int dummy2) +unexec (char *new_name, char *old_name, unsigned int UNUSED (emacs_edata), + unsigned int UNUSED (dummy1), unsigned int UNUSED (dummy2)) { /* ld.so data */ struct _dynamic *ld = 0; @@ -676,7 +677,7 @@ int -run_time_remap (char *dummy) +run_time_remap (char *UNUSED (dummy)) { unsigned long current_sbrk = (unsigned long) sbrk (0);
--- a/src/unexfx2800.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexfx2800.c Mon Sep 20 19:20:08 2004 +0000 @@ -20,10 +20,13 @@ /* Synched up with: FSF 19.31. */ #include <stdio.h> +#include "compiler.h" unexec (new_name, a_name, data_start, bss_start, entry_address) char *new_name, *a_name; - unsigned data_start, bss_start, entry_address; + unsigned UNUSED (data_start); + unsigned UNUSED (bss_start); + unsigned UNUSED (entry_address); { int stat;
--- a/src/unexhp9k3.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexhp9k3.c Mon Sep 20 19:20:08 2004 +0000 @@ -51,6 +51,7 @@ #include <sys/dir.h> #include "sysdep.h" +#include "compiler.h" /* XEmacs: Richard Cognot <cognot@ensg.u-nancy.fr> says we need these */ extern void perror(const char*); @@ -274,8 +275,8 @@ static void *dynamic_addr = (void *) &_DYNAMIC; int -unexec (char *new_name, char *old_name, - unsigned int emacs_edata, unsigned int dummy1, unsigned int dummy2) +unexec (char *new_name, char *old_name, unsigned int emacs_edata, + unsigned int UNUSED (dummy1), unsigned int UNUSED (dummy2)) { /* /dld.sl data */ struct dynamic *ld = 0; @@ -506,7 +507,7 @@ int -run_time_remap (char *dummy) +run_time_remap (char *UNUSED (dummy)) { unsigned long current_sbrk = (unsigned long) sbrk (0);
--- a/src/unexhp9k800.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexhp9k800.c Mon Sep 20 19:20:08 2004 +0000 @@ -101,8 +101,9 @@ int unexec (char *new_name, /* name of the new a.out file to be created */ char *old_name, /* name of the old a.out file */ - uintptr_t new_end_of_text, /* ptr to new edata/etext; NOT USED YET */ - uintptr_t dummy1, uintptr_t dummy2) /* not used by emacs */ + uintptr_t UNUSED (new_end_of_text), /* ptr to new edata/etext */ + uintptr_t UNUSED (dummy1), /* not used by emacs */ + uintptr_t UNUSED (dummy2)) { int old, new; int old_size, new_size; @@ -164,7 +165,7 @@ /* Save current data space in the file, update header. */ void -save_data_space (int file, struct header *hdr, +save_data_space (int file, struct header *UNUSED (hdr), struct som_exec_auxhdr *auxhdr, int size) { /* Write the entire data space out to the file */ @@ -358,7 +359,7 @@ /* run_time_remap is the magic called by startup code in the dumped executable if RUN_TIME_REMAP is set. */ int -run_time_remap (char *dummy) +run_time_remap (char *UNUSED (dummy)) { Restore_Shared_Data (); return 0;
--- a/src/unexmips.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexmips.c Mon Sep 20 19:20:08 2004 +0000 @@ -28,6 +28,7 @@ #include <stdio.h> #include <errno.h> #include <varargs.h> +#include "compiler.h" #ifdef MACH @@ -124,7 +125,9 @@ unexec (new_name, a_name, data_start, bss_start, entry_address) char *new_name, *a_name; - unsigned data_start, bss_start, entry_address; + unsigned data_start; + unsigned UNUSED (bss_start); + unsigned entry_address; { int new, old; int pagesize, brk;
--- a/src/unexnt.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexnt.c Mon Sep 20 19:20:08 2004 +0000 @@ -180,8 +180,8 @@ /* Dump out .data and .bss sections into a new executable. */ int -unexec (Ibyte *new_name, Ibyte *old_name, unsigned int start_data, - unsigned int start_bss, unsigned int entry_address) +unexec (Ibyte *new_name, Ibyte *old_name, unsigned int UNUSED (start_data), + unsigned int UNUSED (start_bss), unsigned int UNUSED (entry_address)) { file_data in_file, out_file; Ibyte *out_filename = alloca_ibytes (qxestrlen (new_name) + 10); @@ -479,7 +479,7 @@ } static void -dump_bss_and_heap (file_data *p_infile, file_data *p_outfile) +dump_bss_and_heap (file_data *UNUSED (p_infile), file_data *p_outfile) { UChar_Binary *heap_data; unsigned long size, index;
--- a/src/unexsni.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexsni.c Mon Sep 20 19:20:08 2004 +0000 @@ -306,6 +306,7 @@ #include <fcntl.h> #include <elf.h> #include <sys/mman.h> +#include "compiler.h" #ifndef emacs #define fatal(a, b, c) fprintf(stderr, a, b, c), exit(1) @@ -357,7 +358,9 @@ void unexec (new_name, old_name, data_start, bss_start, entry_address) char *new_name, *old_name; - unsigned data_start, bss_start, entry_address; + unsigned UNUSED (data_start); + unsigned UNUSED (bss_start); + unsigned UNUSED (entry_address); { extern unsigned int bss_end; int new_file, old_file, new_file_size;
--- a/src/unexsol2-6.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexsol2-6.c Mon Sep 20 19:20:08 2004 +0000 @@ -23,12 +23,14 @@ #include <stdlib.h> #include <stdio.h> #include <dlfcn.h> +#include "compiler.h" int unexec (char *new_name, char *old_name, unsigned int data_start, unsigned int bss_start, unsigned int entry_address); int -unexec (char *new_name, char *old_name, unsigned int data_start, - unsigned int bss_start, unsigned int entry_address) +unexec (char *new_name, char *UNUSED (old_name), + unsigned int UNUSED (data_start), unsigned int UNUSED (bss_start), + unsigned int UNUSED (entry_address)) { if (dldump (0, new_name, RTLD_MEMORY) != 0) {
--- a/src/unexsol2.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexsol2.c Mon Sep 20 19:20:08 2004 +0000 @@ -20,11 +20,12 @@ /* Synched up with: Not in FSF. */ -/* #pragma ident "@(#) $Id: unexsol2.c,v 1.3 1997/10/13 03:35:33 steve Exp $" */ +/* #pragma ident "@(#) $Id: unexsol2.c,v 1.4 2004/09/20 19:20:07 james Exp $" */ #include <stdlib.h> #include <stdio.h> #include <dlfcn.h> +#include "compiler.h" #define DYNODUMP_SO "../dynodump/dynodump.so" #define DYNODUMP_SYM "dynodump" @@ -32,8 +33,9 @@ int unexec (char *new_name, char *old_name, unsigned int data_start, unsigned int bss_start, unsigned int entry_address); int -unexec(char *new_name, char *old_name, unsigned int data_start, - unsigned int bss_start, unsigned int entry_address) +unexec(char *new_name, char *UNUSED (old_name), + unsigned int UNUSED (data_start), unsigned int UNUSED (bss_start), + unsigned int UNUSED (entry_address)) { void *handle; void (*func)(const char *file);
--- a/src/unexsunos4.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unexsunos4.c Mon Sep 20 19:20:08 2004 +0000 @@ -51,6 +51,7 @@ #include <stab.h> #include <sys/dir.h> #include <link.h> +#include "compiler.h" /********************** Macros *************************************/ @@ -434,8 +435,8 @@ static void *dynamic_addr = (void *) &_DYNAMIC; int -unexec (char *new_name, char *old_name, - unsigned int emacs_edata, unsigned int dummy1, unsigned int dummy2) +unexec (char *new_name, char *old_name, unsigned int emacs_edata, + unsigned int UNUSED (dummy1), unsigned int UNUSED (dummy2)) { /* ld.so data */ struct link_dynamic *ld = 0; @@ -615,7 +616,7 @@ int -run_time_remap (char *dummy) +run_time_remap (char *UNUSED (dummy)) { long page_size = getpagesize(); unsigned long base_addr = MASK_UP (mprotect_bottom_addr, page_size);
--- a/src/unicode.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/unicode.c Mon Sep 20 19:20:08 2004 +0000 @@ -2298,7 +2298,8 @@ } static void -unicode_print (Lisp_Object cs, Lisp_Object printcharfun, int escapeflag) +unicode_print (Lisp_Object cs, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { write_fmt_string_lisp (printcharfun, "(%s", 1, unicode_getprop (cs, Qtype)); if (XCODING_SYSTEM_UNICODE_LITTLE_ENDIAN (cs)) @@ -2309,7 +2310,13 @@ } int -dfc_coding_system_is_unicode (Lisp_Object codesys) +dfc_coding_system_is_unicode ( +#ifdef WIN32_ANY + Lisp_Object codesys +#else + Lisp_Object UNUSED (codesys) +#endif + ) { #ifdef WIN32_ANY codesys = Fget_coding_system (codesys);
--- a/src/vm-limit.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/vm-limit.c Mon Sep 20 19:20:08 2004 +0000 @@ -142,7 +142,13 @@ also declare where the end of pure storage is. */ void -memory_warnings (void *start, void (*warnfun) (const char *)) +memory_warnings (void *start, +#ifdef _NO_MALLOC_WARNING_ + void (*UNUSED_ARG (warnfun)) (const char *) ATTRIBUTE_UNUSED +#else + void (*warnfun) (const char *) +#endif + ) { #ifndef _NO_MALLOC_WARNING_ extern void (* __after_morecore_hook) (void); /* From gmalloc.c */
--- a/src/win32.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/win32.c Mon Sep 20 19:20:08 2004 +0000 @@ -466,11 +466,11 @@ } int -mswindows_sigpause (int nsig) +mswindows_sigpause (int UNUSED (nsig)) { /* This is currently not called, because the only call to sigpause inside XEmacs is with SIGCHLD parameter. Just in case, we put an - assert here, so anyone adds a call to sigpause will be surprised + assert here, so anyone who adds a call to sigpause will be surprised (or surprise someone else...) */ assert (0); return 0; @@ -541,8 +541,8 @@ MMRESULT tid_prof = 0; static void CALLBACK -setitimer_helper_proc (UINT uID, UINT uMsg, DWORD dwUser, - DWORD dw1, DWORD dw2) +setitimer_helper_proc (UINT UNUSED (uID), UINT UNUSED (uMsg), DWORD dwUser, + DWORD UNUSED (dw1), DWORD UNUSED (dw2)) { /* Just raise the signal indicated by the dwUser parameter */ mswindows_raise (dwUser);
--- a/src/window.c Mon Sep 20 19:11:29 2004 +0000 +++ b/src/window.c Mon Sep 20 19:20:08 2004 +0000 @@ -265,7 +265,8 @@ } static void -print_window (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +print_window (Lisp_Object obj, Lisp_Object printcharfun, + int UNUSED (escapeflag)) { if (print_readably) printing_unreadable_object ("#<window 0x%x>", XWINDOW (obj)->header.uid); @@ -280,7 +281,7 @@ } static void -finalize_window (void *header, int for_disksave) +finalize_window (void *header, int UNUSED (for_disksave)) { struct window *w = (struct window *) header; @@ -960,7 +961,7 @@ /* Called from invalidate_vertical_divider_cache_in_frame */ int invalidate_vertical_divider_cache_in_window (struct window *w, - void *u_n_u_s_e_d) + void *UNUSED (unused)) { w->need_vertical_divider_valid_p = 0; return 0; @@ -5048,17 +5049,18 @@ static void -modeline_shadow_thickness_changed (Lisp_Object specifier, struct window *w, - Lisp_Object oldval) +modeline_shadow_thickness_changed (Lisp_Object UNUSED (specifier), + struct window *w, + Lisp_Object UNUSED (oldval)) { w->shadow_thickness_changed = 1; MARK_WINDOWS_CHANGED (w); } static void -vertical_divider_changed_in_window (Lisp_Object specifier, +vertical_divider_changed_in_window (Lisp_Object UNUSED (specifier), struct window *w, - Lisp_Object oldval) + Lisp_Object UNUSED (oldval)) { MARK_WINDOWS_CHANGED (w); MARK_FRAME_WINDOWS_STRUCTURE_CHANGED (XFRAME (WINDOW_FRAME (w))); @@ -5066,8 +5068,9 @@ /* also used in scrollbar.c */ void -some_window_value_changed (Lisp_Object specifier, struct window *w, - Lisp_Object oldval) +some_window_value_changed (Lisp_Object UNUSED (specifier), + struct window *w, + Lisp_Object UNUSED (oldval)) { MARK_WINDOWS_CHANGED (w); }