From: <cli...@li...> - 2008-08-20 18:52:28
|
Send clisp-cvs mailing list submissions to cli...@li... To subscribe or unsubscribe via the World Wide Web, visit https://lists.sourceforge.net/lists/listinfo/clisp-cvs or, via email, send a message with subject or body 'help' to cli...@li... You can reach the person managing the list at cli...@li... When replying, please edit your Subject line so it is more specific than "Re: Contents of clisp-cvs digest..." CLISP CVS commits for today Today's Topics: 1. clisp/src ChangeLog,1.6480,1.6481 makemake.in,1.768,1.769 (Sam Steingold) 2. clisp/modules/dbus configure.in,1.5,1.6 (Sam Steingold) 3. clisp/src ChangeLog,1.6481,1.6482 (Sam Steingold) 4. clisp/modules/dbus dbus.xml,1.2,1.3 (Sam Steingold) 5. clisp/modules/dbus config.h.in,1.2,1.3 configure,1.3,1.4 (Sam Steingold) 6. clisp/modules/dbus dbus.lisp,1.6,1.7 (Sam Steingold) ---------------------------------------------------------------------- Message: 1 Date: Wed, 20 Aug 2008 14:01:02 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src ChangeLog,1.6480,1.6481 makemake.in,1.768,1.769 To: cli...@li... Message-ID: <E1K...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18419/src Modified Files: ChangeLog makemake.in Log Message: (check-script): use ${TRCRLF} to delete '\r' from output in addition to replacing '\n' with '_' to fix woe32 Index: makemake.in =================================================================== RCS file: /cvsroot/clisp/clisp/src/makemake.in,v retrieving revision 1.768 retrieving revision 1.769 diff -u -d -r1.768 -r1.769 --- makemake.in 10 Aug 2008 13:21:17 -0000 1.768 +++ makemake.in 20 Aug 2008 14:00:57 -0000 1.769 @@ -3099,7 +3099,8 @@ # check that the scripting works echol "check-script : lisp${LEXE} lispinit.mem" echotab "test \`echo '(princ (+ 11 99))' | \$(RUN) -q -M lispinit.mem -\` = 110 || exit 1" - echotab "test \"\`echo '(+ foo bar)' | \$(RUN) -q -M lispinit.mem -x '(setq foo 11 bar 99)' -repl | tr '\n' '_'\`\" = '99_[1]> _110_' || exit 1" + TRCRLF="tr '\n' '_' | tr -d '\r'" + echotab "test \"\`echo '(+ foo bar)' | \$(RUN) -q -M lispinit.mem -x '(setq foo 11 bar 99)' -repl | ${TRCRLF}\`\" = '99_[1]> _110_' || exit 1" echotab "echo '(progn (setf (stream-element-type *standard-input*) (quote (unsigned-byte 8))) (exit 42))' | \$(RUN) -q -M lispinit.mem -; test \$\$? = 42 || exit 1" echotab "test \`echo '(setf (stream-element-type *standard-output*) (quote (unsigned-byte 8))) (write-sequence (convert-string-to-bytes \"42\" charset:ascii) *standard-output*) (setf (stream-element-type *standard-output*) (quote character)) (terpri)' | ./lisp.run -B . -N locale -E UTF-8 -Epathname 1:1 -Emisc 1:1 -norc -q -M lispinit.mem - | cat\` = 42 || exit 1" echotab "\$(RM) script.lisp; echo '(+ 11 99)' > script.lisp" @@ -3107,10 +3108,10 @@ echotab "\$(RM) script.lisp; echo '(princ (+ 11 99))' > script.lisp" echotab "test \`\$(RUN) -q -M lispinit.mem script.lisp\` = 110 || exit 1" echotab "\$(RM) script.lisp; echo '(+ foo bar)' > script.lisp" - echotab "test \`\$(RUN) -q -M lispinit.mem -x '(setq foo 11 bar 99)' -repl < script.lisp | tr '\n' '_'\` = 99_110_ || exit 1" + echotab "test \`\$(RUN) -q -M lispinit.mem -x '(setq foo 11 bar 99)' -repl < script.lisp | ${TRCRLF}\` = 99_110_ || exit 1" # "-x with lisp-file is invalid" # echotab "\$(RM) script.lisp; echo '(princ (+ foo bar))' > script.lisp" - # echotab "test \`\$(RUN) -q -M lispinit.mem -x '(setq foo 11 bar 99)' -repl script.lisp | tr '\n' '_'\` = 99_110_ || exit 1" + # echotab "test \`\$(RUN) -q -M lispinit.mem -x '(setq foo 11 bar 99)' -repl script.lisp | ${TRCRLF}\` = 99_110_ || exit 1" echotab "\$(RM) script.lisp; echo '(progn (setf (stream-element-type *standard-input*) (quote (unsigned-byte 8))) (exit 42))' > script.lisp" echotab "\$(RUN) -q -M lispinit.mem < script.lisp; test \$\$? = 42 || exit 1" echotab "\$(RUN) -q -M lispinit.mem script.lisp; test \$\$? = 42 || exit 1" Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.6480 retrieving revision 1.6481 diff -u -d -r1.6480 -r1.6481 --- ChangeLog 18 Aug 2008 18:53:18 -0000 1.6480 +++ ChangeLog 20 Aug 2008 14:00:54 -0000 1.6481 @@ -1,3 +1,8 @@ +2008-08-20 Sam Steingold <sd...@gn...> + + * makemake.in (check-script): use ${TRCRLF} to delete '\r' from + output in addition to replacing '\n' with '_' to fix woe32 + 2008-08-18 Sam Steingold <sd...@gn...> * modules/syscalls/calls.c: make sure that end_system_call() is ------------------------------ Message: 2 Date: Wed, 20 Aug 2008 18:48:43 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/modules/dbus configure.in,1.5,1.6 To: cli...@li... Message-ID: <E1K...@ma...> Update of /cvsroot/clisp/clisp/modules/dbus In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28880/modules/dbus Modified Files: configure.in Log Message: (dbus_int64_t, dbus_int32_t, dbus_uint32_t) (dbus_int16_t, dbus_unichar_t, dbus_bool_t): check types Index: configure.in =================================================================== RCS file: /cvsroot/clisp/clisp/modules/dbus/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- configure.in 1 Aug 2008 17:47:26 -0000 1.5 +++ configure.in 20 Aug 2008 18:48:41 -0000 1.6 @@ -18,6 +18,11 @@ PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0,,[AC_MSG_ERROR([cannot find D-Bus])]) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) +dbus_save_CFLAGS=$CFLAGS +AC_LIB_APPENDTOVAR([CFLAGS], [$DBUS_CFLAGS]) +AC_CHECK_TYPES([dbus_int64_t, dbus_int32_t, dbus_uint32_t, dbus_int16_t, +dbus_unichar_t, dbus_bool_t],,,[#include <dbus/dbus.h>]) +CFLAGS=$dbus_save_CFLAGS BOLD_MSG([Dbus (Functions)]) dbus_save_LIB=$LIBS ------------------------------ Message: 3 Date: Wed, 20 Aug 2008 18:48:44 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src ChangeLog,1.6481,1.6482 To: cli...@li... Message-ID: <E1K...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28880/src Modified Files: ChangeLog Log Message: (dbus_int64_t, dbus_int32_t, dbus_uint32_t) (dbus_int16_t, dbus_unichar_t, dbus_bool_t): check types Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.6481 retrieving revision 1.6482 diff -u -d -r1.6481 -r1.6482 --- ChangeLog 20 Aug 2008 14:00:54 -0000 1.6481 +++ ChangeLog 20 Aug 2008 18:48:41 -0000 1.6482 @@ -1,5 +1,10 @@ 2008-08-20 Sam Steingold <sd...@gn...> + * modules/dbus/configure.in (dbus_int64_t, dbus_int32_t, dbus_uint32_t) + (dbus_int16_t, dbus_unichar_t, dbus_bool_t): check types + +2008-08-20 Sam Steingold <sd...@gn...> + * makemake.in (check-script): use ${TRCRLF} to delete '\r' from output in addition to replacing '\n' with '_' to fix woe32 ------------------------------ Message: 4 Date: Wed, 20 Aug 2008 18:49:08 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/modules/dbus dbus.xml,1.2,1.3 To: cli...@li... Message-ID: <E1K...@ma...> Update of /cvsroot/clisp/clisp/modules/dbus In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29244/modules/dbus Modified Files: dbus.xml Log Message: link to modules/dbus/test.tst Index: dbus.xml =================================================================== RCS file: /cvsroot/clisp/clisp/modules/dbus/dbus.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- dbus.xml 3 Aug 2008 04:20:18 -0000 1.2 +++ dbus.xml 20 Aug 2008 18:49:06 -0000 1.3 @@ -16,5 +16,7 @@ <para>All public &c-lang; functions are available as &foreign-function-t;s, defined in <filename role="clisp-cvs">modules/dbus/dbus.lisp</filename>.</para> +<para>For usage examples, please see + <filename role="clisp-cvs">modules/dbus/test.tst</filename>.</para> </section> ------------------------------ Message: 5 Date: Wed, 20 Aug 2008 18:49:24 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/modules/dbus config.h.in,1.2,1.3 configure,1.3,1.4 To: cli...@li... Message-ID: <E1K...@ma...> Update of /cvsroot/clisp/clisp/modules/dbus In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29268/modules/dbus Modified Files: config.h.in configure Log Message: regenerated Index: config.h.in =================================================================== RCS file: /cvsroot/clisp/clisp/modules/dbus/config.h.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- config.h.in 1 Aug 2008 17:47:43 -0000 1.2 +++ config.h.in 20 Aug 2008 18:49:22 -0000 1.3 @@ -15,6 +15,9 @@ /* Define to 1 if you have the `dbus_address_unescape_value' function. */ #undef HAVE_DBUS_ADDRESS_UNESCAPE_VALUE +/* Define to 1 if the system has the type `dbus_bool_t'. */ +#undef HAVE_DBUS_BOOL_T + /* Define to 1 if you have the `dbus_bus_add_match' function. */ #undef HAVE_DBUS_BUS_ADD_MATCH @@ -280,6 +283,15 @@ /* Define to 1 if you have the `dbus_get_local_machine_id' function. */ #undef HAVE_DBUS_GET_LOCAL_MACHINE_ID +/* Define to 1 if the system has the type `dbus_int16_t'. */ +#undef HAVE_DBUS_INT16_T + +/* Define to 1 if the system has the type `dbus_int32_t'. */ +#undef HAVE_DBUS_INT32_T + +/* Define to 1 if the system has the type `dbus_int64_t'. */ +#undef HAVE_DBUS_INT64_T + /* Define to 1 if you have the `dbus_malloc' function. */ #undef HAVE_DBUS_MALLOC @@ -644,6 +656,12 @@ /* Define to 1 if you have the `dbus_type_is_fixed' function. */ #undef HAVE_DBUS_TYPE_IS_FIXED +/* Define to 1 if the system has the type `dbus_uint32_t'. */ +#undef HAVE_DBUS_UINT32_T + +/* Define to 1 if the system has the type `dbus_unichar_t'. */ +#undef HAVE_DBUS_UNICHAR_T + /* Define to 1 if you have the `dbus_watch_get_data' function. */ #undef HAVE_DBUS_WATCH_GET_DATA Index: configure =================================================================== RCS file: /cvsroot/clisp/clisp/modules/dbus/configure,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- configure 1 Aug 2008 17:47:43 -0000 1.3 +++ configure 20 Aug 2008 18:49:22 -0000 1.4 @@ -3970,6 +3970,656 @@ fi +dbus_save_CFLAGS=$CFLAGS + + for element in $DBUS_CFLAGS; do + haveit= + for x in $CFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CFLAGS="${CFLAGS}${CFLAGS:+ }$element" + fi + done + +{ $as_echo "$as_me:$LINENO: checking for dbus_int64_t" >&5 +$as_echo_n "checking for dbus_int64_t... " >&6; } +if test "${ac_cv_type_dbus_int64_t+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_type_dbus_int64_t=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <dbus/dbus.h> + +int +main () +{ +if (sizeof (dbus_int64_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <dbus/dbus.h> + +int +main () +{ +if (sizeof ((dbus_int64_t))) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_dbus_int64_t=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_dbus_int64_t" >&5 +$as_echo "$ac_cv_type_dbus_int64_t" >&6; } +if test $ac_cv_type_dbus_int64_t = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DBUS_INT64_T 1 +_ACEOF + + +fi +{ $as_echo "$as_me:$LINENO: checking for dbus_int32_t" >&5 +$as_echo_n "checking for dbus_int32_t... " >&6; } +if test "${ac_cv_type_dbus_int32_t+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_type_dbus_int32_t=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <dbus/dbus.h> + +int +main () +{ +if (sizeof (dbus_int32_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <dbus/dbus.h> + +int +main () +{ +if (sizeof ((dbus_int32_t))) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_dbus_int32_t=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_dbus_int32_t" >&5 +$as_echo "$ac_cv_type_dbus_int32_t" >&6; } +if test $ac_cv_type_dbus_int32_t = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DBUS_INT32_T 1 +_ACEOF + + +fi +{ $as_echo "$as_me:$LINENO: checking for dbus_uint32_t" >&5 +$as_echo_n "checking for dbus_uint32_t... " >&6; } +if test "${ac_cv_type_dbus_uint32_t+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_type_dbus_uint32_t=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <dbus/dbus.h> + +int +main () +{ +if (sizeof (dbus_uint32_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <dbus/dbus.h> + +int +main () +{ +if (sizeof ((dbus_uint32_t))) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_dbus_uint32_t=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_dbus_uint32_t" >&5 +$as_echo "$ac_cv_type_dbus_uint32_t" >&6; } +if test $ac_cv_type_dbus_uint32_t = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DBUS_UINT32_T 1 +_ACEOF + + +fi +{ $as_echo "$as_me:$LINENO: checking for dbus_int16_t" >&5 +$as_echo_n "checking for dbus_int16_t... " >&6; } +if test "${ac_cv_type_dbus_int16_t+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_type_dbus_int16_t=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <dbus/dbus.h> + +int +main () +{ +if (sizeof (dbus_int16_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <dbus/dbus.h> + +int +main () +{ +if (sizeof ((dbus_int16_t))) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_dbus_int16_t=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_dbus_int16_t" >&5 +$as_echo "$ac_cv_type_dbus_int16_t" >&6; } +if test $ac_cv_type_dbus_int16_t = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DBUS_INT16_T 1 +_ACEOF + + +fi +{ $as_echo "$as_me:$LINENO: checking for dbus_unichar_t" >&5 +$as_echo_n "checking for dbus_unichar_t... " >&6; } +if test "${ac_cv_type_dbus_unichar_t+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_type_dbus_unichar_t=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <dbus/dbus.h> + +int +main () +{ +if (sizeof (dbus_unichar_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <dbus/dbus.h> + +int +main () +{ +if (sizeof ((dbus_unichar_t))) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_dbus_unichar_t=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_dbus_unichar_t" >&5 +$as_echo "$ac_cv_type_dbus_unichar_t" >&6; } +if test $ac_cv_type_dbus_unichar_t = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DBUS_UNICHAR_T 1 +_ACEOF + + +fi +{ $as_echo "$as_me:$LINENO: checking for dbus_bool_t" >&5 +$as_echo_n "checking for dbus_bool_t... " >&6; } +if test "${ac_cv_type_dbus_bool_t+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_type_dbus_bool_t=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <dbus/dbus.h> + +int +main () +{ +if (sizeof (dbus_bool_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <dbus/dbus.h> + +int +main () +{ +if (sizeof ((dbus_bool_t))) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_dbus_bool_t=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_dbus_bool_t" >&5 +$as_echo "$ac_cv_type_dbus_bool_t" >&6; } +if test $ac_cv_type_dbus_bool_t = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DBUS_BOOL_T 1 +_ACEOF + + +fi + +CFLAGS=$dbus_save_CFLAGS { $as_echo "$as_me:$LINENO: ${term_bold}** Dbus (Functions)${term_norm}" >&5 $as_echo "$as_me: ${term_bold}** Dbus (Functions)${term_norm}" >&6;} ------------------------------ Message: 6 Date: Wed, 20 Aug 2008 18:52:23 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/modules/dbus dbus.lisp,1.6,1.7 To: cli...@li... Message-ID: <E1K...@ma...> Update of /cvsroot/clisp/clisp/modules/dbus In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30400/modules/dbus Modified Files: dbus.lisp Log Message: (def-c-const): import from EXPORTING; pass DBusError by reference using (c-pointer DBusError) instead of returning a fresh object using (error (c-ptr DBusError) :in-out) et al; (DBusMessageIter): add def-c-type Index: dbus.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/modules/dbus/dbus.lisp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- dbus.lisp 1 Aug 2008 16:19:34 -0000 1.6 +++ dbus.lisp 20 Aug 2008 18:52:21 -0000 1.7 @@ -16,7 +16,8 @@ (:use "CL" "FFI") (:shadowing-import-from "EXPORTING" #:defconstant #:defvar #:defun #:defmacro #:define-symbol-macro - #:def-c-type #:def-c-enum #:def-c-struct #:def-c-var #:def-call-out)) + #:def-c-const #:def-c-type #:def-c-enum #:def-c-struct #:def-c-var + #:def-call-out)) (in-package "DBUS") @@ -52,34 +53,34 @@ ;; void dbus_error_init (DBusError *error); (def-call-out dbus_error_init (:return-type nil) - (:arguments (error (c-ptr DBusError)))) + (:arguments (error (c-pointer DBusError)))) ;; void dbus_error_free (DBusError *error); (def-call-out dbus_error_free (:return-type nil) - (:arguments (error (c-ptr DBusError)))) + (:arguments (error (c-pointer DBusError)))) ;; void dbus_set_error (DBusError *error, const char *name, const char *message, ...); (def-call-out dbus_set_error (:return-type nil) - (:arguments (error (c-ptr DBusError) :in-out) + (:arguments (error (c-pointer DBusError)) (name c-string) (message c-string))) ;; void dbus_set_error_const (DBusError *error, const char *name, const char *message); (def-call-out dbus_set_error_const (:return-type nil) - (:arguments (error (c-ptr DBusError) :in-out) + (:arguments (error (c-pointer DBusError)) (name c-string) (message c-string))) ;; void dbus_move_error (DBusError *src, DBusError *dest); (def-call-out dbus_move_error (:return-type nil) - (:arguments (src (c-ptr DBusError) :in) - (dst (c-ptr DBusError) :out))) + (:arguments (src (c-pointer DBusError)) + (dst (c-pointer DBusError)))) ;; dbus_bool_t dbus_error_has_name (const DBusError *error, const char *name); (def-call-out dbus_error_has_name (:return-type dbus_bool_t) - (:arguments (error (c-ptr DBusError) :in) (name c-string))) + (:arguments (error (c-pointer DBusError)) (name c-string))) ;; dbus_bool_t dbus_error_is_set (const DBusError *error); (def-call-out dbus_error_is_set (:return-type dbus_bool_t) - (:arguments (error (c-ptr DBusError) :in))) + (:arguments (error (c-pointer DBusError)))) ;; === dbus-address.h ;; Opaque type representing one of the semicolon-separated items in an address @@ -91,7 +92,7 @@ (:arguments (address c-string) (entry (c-ptr (c-pointer DBusAddressEntry*)) :out) (array_len (c-ptr int) :out) - (error (c-ptr DBusError) :in-out))) + (error (c-pointer DBusError)))) ;; const char *dbus_address_entry_get_value (DBusAddressEntry *entry, const char *key); (def-call-out dbus_address_entry_get_value (:return-type c-string) @@ -111,7 +112,7 @@ ;; char* dbus_address_unescape_value (const char *value, DBusError *error); (def-call-out dbus_address_unescape_value (:return-type c-string) - (:arguments (value c-string) (error (c-ptr DBusError) :in-out))) + (:arguments (value c-string) (error (c-pointer DBusError)))) ;; === dbus-memory.h @@ -146,7 +147,8 @@ ;; needs to be freed and can be allocated on the stack. ;; typedef struct DBusMessageIter DBusMessageIter; (def-c-type DBusMessage* c-pointer) -(def-c-type DBusMessageIter* c-pointer) +(def-c-type DBusMessageIter c-pointer) +(def-c-type DBusMessageIter* (c-pointer DBusMessageIter)) ;; DBusMessage* dbus_message_new (int message_type); (def-call-out dbus_message_new (:return-type DBusMessage*) @@ -329,11 +331,11 @@ ;; dbus_bool_t dbus_message_get_args (DBusMessage *message, DBusError *error, int first_arg_type, ...); ;(def-call-out dbus_message_get_args (:return-type dbus_bool_t) -; (:arguments (message DBusMessage*) (error (c-ptr DBusError) :out) (first_arg_type int) (... ))) +; (:arguments (message DBusMessage*) (error (c-pointer DBusError)) (first_arg_type int) (... ))) ;; dbus_bool_t dbus_message_get_args_valist (DBusMessage *message, DBusError *error, int first_arg_type, va_list var_args); ;(def-call-out dbus_message_get_args_valist (:return-type dbus_bool_t) -; (:arguments (message DBusMessage*) (error (c-ptr DBusError) :out) (first_arg_type int) (var_args va_list))) +; (:arguments (message DBusMessage*) (error (c-pointer DBusError)) (first_arg_type int) (var_args va_list))) @@ -402,7 +404,7 @@ ;; dbus_bool_t dbus_set_error_from_message (DBusError *error, DBusMessage *message); (def-call-out dbus_set_error_from_message (:return-type dbus_bool_t) - (:arguments (error (c-ptr DBusError) :out) (message DBusMessage*))) + (:arguments (error (c-pointer DBusError)) (message DBusMessage*))) @@ -440,7 +442,7 @@ ;; DBusMessage* dbus_message_demarshal (const char *str, int len, DBusError *error); (def-call-out dbus_message_demarshal (:return-type DBusMessage*) - (:arguments (str c-pointer) (len int) (error (c-ptr DBusError) :out))) + (:arguments (str c-pointer) (len int) (error (c-pointer DBusError)))) @@ -677,11 +679,11 @@ ;; DBusConnection* dbus_connection_open (const char *address, DBusError *error); (def-call-out dbus_connection_open (:return-type DBusConnection*) - (:arguments (address c-string) (error (c-ptr DBusError) :out))) + (:arguments (address c-string) (error (c-pointer DBusError)))) ;; DBusConnection* dbus_connection_open_private (const char *address, DBusError *error); (def-call-out dbus_connection_open_private (:return-type DBusConnection*) - (:arguments (address c-string) (error (c-ptr DBusError) :out))) + (:arguments (address c-string) (error (c-pointer DBusError)))) ;; DBusConnection* dbus_connection_ref (DBusConnection *connection); (def-call-out dbus_connection_ref (:return-type DBusConnection*) @@ -769,7 +771,7 @@ ;; DBusMessage * dbus_connection_send_with_reply_and_block (DBusConnection *connection, DBusMessage *message, int timeout_milliseconds, DBusError *error); (def-call-out dbus_connection_send_with_reply_and_block (:return-type DBusMessage*) (:arguments (connection DBusConnection*) (message DBusMessage*) - (timeout_milliseconds int) (error (c-ptr DBusError) :out))) + (timeout_milliseconds int) (error (c-pointer DBusError)))) ;; dbus_bool_t dbus_connection_set_watch_functions (DBusConnection *connection, DBusAddWatchFunction add_function, DBusRemoveWatchFunction remove_function, DBusWatchToggledFunction toggled_function, void *data, DBusFreeFunction free_data_function); (def-call-out dbus_connection_set_watch_functions (:return-type dbus_bool_t) @@ -949,7 +951,7 @@ (def-call-out dbus_connection_try_register_object_path (:return-type dbus_bool_t) (:arguments (connection DBusConnection*) (path c-string) (vtable DBusObjectPathVTable*) (user_data c-pointer) - (error (c-ptr DBusError) :out))) + (error (c-pointer DBusError)))) ;; dbus_bool_t dbus_connection_register_object_path (DBusConnection *connection, const char *path, const DBusObjectPathVTable *vtable, void *user_data); (def-call-out dbus_connection_register_object_path (:return-type dbus_bool_t) @@ -960,7 +962,7 @@ (def-call-out dbus_connection_try_register_fallback (:return-type dbus_bool_t) (:arguments (connection DBusConnection*) (path c-string) (vtable DBusObjectPathVTable*) (user_data c-pointer) - (error (c-ptr DBusError) :out))) + (error (c-pointer DBusError)))) ;; dbus_bool_t dbus_connection_register_fallback (DBusConnection *connection, const char *path, const DBusObjectPathVTable *vtable, void *user_data); (def-call-out dbus_connection_register_fallback (:return-type dbus_bool_t) @@ -1057,16 +1059,16 @@ ;; DBusConnection *dbus_bus_get (DBusBusType type, DBusError *error); (def-call-out dbus_bus_get (:return-type DBusConnection*) - (:arguments (type DBusBusType) (error (c-ptr DBusError) :out))) + (:arguments (type DBusBusType) (error (c-pointer DBusError)))) ;; DBusConnection *dbus_bus_get_private (DBusBusType type, DBusError *error); (def-call-out dbus_bus_get_private (:return-type DBusConnection*) - (:arguments (type DBusBusType) (error (c-ptr DBusError) :out))) + (:arguments (type DBusBusType) (error (c-pointer DBusError)))) ;; dbus_bool_t dbus_bus_register (DBusConnection *connection, DBusError *error); (def-call-out dbus_bus_register (:return-type dbus_bool_t) - (:arguments (connection DBusConnection*) (error (c-ptr DBusError) :out))) + (:arguments (connection DBusConnection*) (error (c-pointer DBusError)))) ;; dbus_bool_t dbus_bus_set_unique_name (DBusConnection *connection, const char *unique_name); (def-call-out dbus_bus_set_unique_name (:return-type dbus_bool_t) @@ -1079,44 +1081,44 @@ ;; unsigned long dbus_bus_get_unix_user (DBusConnection *connection, const char *name, DBusError *error); (def-call-out dbus_bus_get_unix_user (:return-type ulong) (:arguments (connection DBusConnection*) (name c-string) - (error (c-ptr DBusError) :out))) + (error (c-pointer DBusError)))) ;; char* dbus_bus_get_id (DBusConnection *connection, DBusError *error); (def-call-out dbus_bus_get_id (:return-type c-string) - (:arguments (connection DBusConnection*) (error (c-ptr DBusError) :out))) + (:arguments (connection DBusConnection*) (error (c-pointer DBusError)))) ;; int dbus_bus_request_name (DBusConnection *connection, const char *name, unsigned int flags, DBusError *error); (def-call-out dbus_bus_request_name (:return-type int) (:arguments (connection DBusConnection*) (name c-string) - (flags uint) (error (c-ptr DBusError) :out))) + (flags uint) (error (c-pointer DBusError)))) ;; int dbus_bus_release_name (DBusConnection *connection, const char *name, DBusError *error); (def-call-out dbus_bus_release_name (:return-type int) (:arguments (connection DBusConnection*) (name c-string) - (error (c-ptr DBusError) :out))) + (error (c-pointer DBusError)))) ;; dbus_bool_t dbus_bus_name_has_owner (DBusConnection *connection, const char *name, DBusError *error); (def-call-out dbus_bus_name_has_owner (:return-type dbus_bool_t) (:arguments (connection DBusConnection*) (name c-string) - (error (c-ptr DBusError) :out))) + (error (c-pointer DBusError)))) ;; dbus_bool_t dbus_bus_start_service_by_name (DBusConnection *connection, const char *name, dbus_uint32_t flags, dbus_uint32_t *reply, DBusError *error); (def-call-out dbus_bus_start_service_by_name (:return-type dbus_bool_t) (:arguments (connection DBusConnection*) (name c-string) (flags dbus_uint32_t) (reply (c-ptr dbus_uint32_t) :out) - (error (c-ptr DBusError) :out))) + (error (c-pointer DBusError)))) ;; void dbus_bus_add_match (DBusConnection *connection, const char *rule, DBusError *error); (def-call-out dbus_bus_add_match (:return-type nil) (:arguments (connection DBusConnection*) (rule c-string) - (error (c-ptr DBusError) :out))) + (error (c-pointer DBusError)))) ;; void dbus_bus_remove_match (DBusConnection *connection, const char *rule, DBusError *error); (def-call-out dbus_bus_remove_match (:return-type nil) (:arguments (connection DBusConnection*) (rule c-string) - (error (c-ptr DBusError) :out))) + (error (c-pointer DBusError)))) ;; === dbus-pending-call.h @@ -1544,7 +1546,7 @@ ;; DBusServer* dbus_server_listen (const char *address, DBusError *error); (def-call-out dbus_server_listen (:return-type DBusServer*) - (:arguments (address c-string) (error (c-ptr DBusError) :out))) + (:arguments (address c-string) (error (c-pointer DBusError)))) ;; DBusServer* dbus_server_ref (DBusServer *server); (def-call-out dbus_server_ref (:return-type DBusServer*) @@ -1649,12 +1651,12 @@ ;; dbus_bool_t dbus_signature_validate (const char *signature, DBusError *error); (def-call-out dbus_signature_validate (:return-type dbus_bool_t) - (:arguments (signature c-string) (error (c-ptr DBusError) :out))) + (:arguments (signature c-string) (error (c-pointer DBusError)))) ;; dbus_bool_t dbus_signature_validate_single (const char *signature, DBusError *error); (def-call-out dbus_signature_validate_single (:return-type dbus_bool_t) - (:arguments (signature c-string) (error (c-ptr DBusError) :out))) + (:arguments (signature c-string) (error (c-pointer DBusError)))) ;; dbus_bool_t dbus_type_is_basic (int typecode); ------------------------------ ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ------------------------------ _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest, Vol 28, Issue 21 ***************************************** |