[Galago-commits] r1978 - in branches/libgalago/glib-port: .
libgalago
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Thu Jun 23 01:15:31 PDT 2005
Author: chipx86
Date: 2005-06-23 01:14:39 -0700 (Thu, 23 Jun 2005)
New Revision: 1978
Added:
branches/libgalago/glib-port/libgalago/galago-marshal.list
Removed:
branches/libgalago/glib-port/libgalago/galago-marshal.c
branches/libgalago/glib-port/libgalago/galago-marshal.h
Modified:
branches/libgalago/glib-port/ChangeLog
branches/libgalago/glib-port/configure.ac
branches/libgalago/glib-port/libgalago/
Log:
Added back support for custom marshals, but this time through glib-genmarshal.
Modified: branches/libgalago/glib-port/ChangeLog
===================================================================
--- branches/libgalago/glib-port/ChangeLog 2005-06-23 06:32:53 UTC (rev 1977)
+++ branches/libgalago/glib-port/ChangeLog 2005-06-23 08:14:39 UTC (rev 1978)
@@ -1,3 +1,13 @@
+Thu Jun 23 01:10:34 PDT 2005 Christian Hammond <chipx86 at chipx86.com>
+
+ * libgalago/Makefile.am:
+ D libgalago/galago-marshal.c:
+ D libgalago/galago-marshal.h:
+ A libgalago/galago-marshal.list:
+ * configure.ac:
+ - Added back support for custom marshals, but this time through
+ glib-genmarshal.
+
Wed Jun 22 23:31:56 PDT 2005 Christian Hammond <chipx86 at chipx86.com>
* libgalago/galago-dbus.h:
Modified: branches/libgalago/glib-port/configure.ac
===================================================================
--- branches/libgalago/glib-port/configure.ac 2005-06-23 06:32:53 UTC (rev 1977)
+++ branches/libgalago/glib-port/configure.ac 2005-06-23 08:14:39 UTC (rev 1978)
@@ -97,6 +97,9 @@
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
+GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+AC_SUBST(GLIB_GENMARSHAL)
+
dnl
dnl Check the D-BUS version.
dnl
@@ -122,79 +125,7 @@
CFLAGS="$old_CFLAGS"
CPPFLAGS="$old_CPPFLAGS"
-dnl
-dnl # Check for va_copy compatibility functions. Thanks again glib!
-dnl
-AC_CACHE_CHECK([for an implementation of va_copy()], galago_cv_va_copy, [
- AC_LINK_IFELSE([#include <stdarg.h>
- void f(int i, ...) {
- va_list args1, args2;
- va_start(args1, i);
- va_copy(args2, args1);
- if (va_arg(args2, int) != 42 || va_arg(args1, int) != 42)
- exit(1);
- va_end(args1); va_end(args2);
- }
- int main() {
- f(0, 42);
- return 0;
- }],
- [galago_cv_va_copy=yes],
- [galago_cv_va_copy=no])
-])
-AC_CACHE_CHECK([for an implementation of __va_copy()], galago_cv___va_copy, [
- AC_LINK_IFELSE([#include <stdarg.h>
- void f(int i, ...) {
- va_list args1, args2;
- va_start(args1, i);
- __va_copy(args2, args1);
- if (va_arg(args2, int) != 42 || va_arg(args1, int) != 42)
- exit(1);
- va_end(args1); va_end(args2);
- }
- int main() {
- f(0, 42);
- return 0;
- }],
- [galago_cv___va_copy=yes],
- [galago_cv___va_copy=no])
-])
-if test "x$galago_cv_va_copy" = "xyes"; then
- galago_va_copy_func=va_copy
-else if test "x$galago_cv___va_copy" = "xyes"; then
- galago_va_copy_func=__va_copy
-fi
-fi
-
-if test -n "$galago_va_copy_func"; then
- AC_DEFINE_UNQUOTED(GALAGO_VA_COPY, $galago_va_copy_func, [A 'va_copy' style function])
-fi
-
-AC_CACHE_CHECK([whether va_lists can be copied by value], galago_cv_va_val_copy, [
- AC_TRY_RUN([#include <stdarg.h>
- void f(int i, ...) {
- va_list args1, args2;
- va_start(args1, i);
- args2 = args1;
- if (va_arg(args2, int) != 42 || va_arg(args1, int) != 42)
- exit(1);
- va_end(args1); va_end(args2);
- }
- int main() {
- f(0, 42);
- return 0;
- }],
- [galago_cv_va_val_copy=yes],
- [galago_cv_va_val_copy=no],
- [galago_cv_va_val_copy=yes])
-])
-
-if test "x$galago_cv_va_val_copy" = "xno"; then
- AC_DEFINE(GALAGO_VA_COPY_AS_ARRAY, 1, ['va_lists' cannot be copied as values])
-fi
-
-
dnl #
dnl # Check for Check
dnl #
Property changes on: branches/libgalago/glib-port/libgalago
___________________________________________________________________
Name: svn:ignore
- .libs
.deps
Makefile
Makefile.in
core
tags
*.la
*.o
*.lo
*.loT
.*.swp
.*.swo
+ .libs
.deps
Makefile
Makefile.in
core
galago-marshal.c
galago-marshal.h
tags
*.la
*.o
*.lo
*.loT
.*.swp
.*.swo
Deleted: branches/libgalago/glib-port/libgalago/galago-marshal.c
===================================================================
--- branches/libgalago/glib-port/libgalago/galago-marshal.c 2005-06-23 06:32:53 UTC (rev 1977)
+++ branches/libgalago/glib-port/libgalago/galago-marshal.c 2005-06-23 08:14:39 UTC (rev 1978)
@@ -1,73 +0,0 @@
-/**
- * @file libgalago/galago-marshal.c Galago Marshallers
- *
- * @Copyright (C) 2004-2005 Christian Hammond
- *
- * This library is g_free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#include <libgalago/galago-marshal.h>
-
-void
-galago_marshal_VOID(GCallback cb, GalagoObject *obj,
- const char *property, va_list args, void *data)
-{
- ((void (*)(GalagoObject *, const char *, void *))cb)(obj, property, data);
-}
-
-void
-galago_marshal_VOID__POINTER(GCallback cb, GalagoObject *obj,
- const char *property, va_list args, void *data)
-{
- void *arg1 = va_arg(args, void *);
-
- ((void (*)(GalagoObject *, const char *, void *, void *))cb)(
- obj, property, arg1, data);
-}
-
-void
-galago_marshal_VOID__BOXED(GCallback cb, GalagoObject *obj,
- const char *property, va_list args, void *data)
-{
- void *arg1 = va_arg(args, void *);
-
- ((void (*)(GalagoObject *, const char *, void *, void *))cb)(
- obj, property, arg1, data);
-}
-
-void
-galago_marshal_VOID__BOOLEAN_ULONG(GCallback cb, GalagoObject *obj,
- const char *property, va_list args,
- void *data)
-{
- gboolean arg1 = va_arg(args, gboolean);
- unsigned long arg2 = va_arg(args, unsigned long);
-
- ((void (*)(GalagoObject *, const char *, gboolean,
- unsigned long, void *))cb)(
- obj, property, arg1, arg2, data);
-}
-
-void
-galago_marshal_VOID__POINTER_STRING(GCallback cb, GalagoObject *obj,
- const char *property, va_list args,
- void *data)
-{
- void *arg1 = va_arg(args, void *);
- char *arg2 = va_arg(args, char *);
-
- ((void (*)(GalagoObject *, const char *, void *, char *, void *))cb)(
- obj, property, arg1, arg2, data);
-}
Deleted: branches/libgalago/glib-port/libgalago/galago-marshal.h
===================================================================
--- branches/libgalago/glib-port/libgalago/galago-marshal.h 2005-06-23 06:32:53 UTC (rev 1977)
+++ branches/libgalago/glib-port/libgalago/galago-marshal.h 2005-06-23 08:14:39 UTC (rev 1978)
@@ -1,37 +0,0 @@
-/**
- * @file libgalago/galago-marshal.h Galago Marshallers
- *
- * @Copyright (C) 2004-2005 Christian Hammond
- *
- * This library is g_free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef _GALAGO_MARSHAL_H_
-#define _GALAGO_MARSHAL_H_
-
-#include <libgalago/galago-object.h>
-
-void galago_marshal_VOID(GCallback cb, GalagoObject *obj,
- const char *property, va_list args, void *data);
-void galago_marshal_VOID__POINTER(GCallback cb, GalagoObject *obj,
- const char *property, va_list args, void *data);
-void galago_marshal_VOID__BOXED(GCallback cb, GalagoObject *obj,
- const char *property, va_list args, void *data);
-void galago_marshal_VOID__BOOLEAN_ULONG(GCallback cb, GalagoObject *obj,
- const char *property, va_list args, void *data);
-void galago_marshal_VOID__POINTER_STRING(GCallback cb, GalagoObject *obj,
- const char *property, va_list args, void *data);
-
-#endif /* _GALAGO_MARSHAL_H_ */
Added: branches/libgalago/glib-port/libgalago/galago-marshal.list
===================================================================
--- branches/libgalago/glib-port/libgalago/galago-marshal.list 2005-06-23 06:32:53 UTC (rev 1977)
+++ branches/libgalago/glib-port/libgalago/galago-marshal.list 2005-06-23 08:14:39 UTC (rev 1978)
@@ -0,0 +1 @@
+VOID:BOOLEAN,ULONG
More information about the galago-commits
mailing list