[glib/gvariant: 84/85] Merge branch 'master' into gvariant
- From: Ryan Lortie <ryanl src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glib/gvariant: 84/85] Merge branch 'master' into gvariant
- Date: Fri, 22 Jan 2010 18:14:53 +0000 (UTC)
commit 5dac7b01cc4b5623e1bc76a82623fb441752af1e
Merge: f2d30dd 7693b0a
Author: Ryan Lortie <desrt desrt ca>
Date: Thu Jan 21 22:01:41 2010 -0500
Merge branch 'master' into gvariant
Conflicts:
configure.in
docs/reference/glib/glib-docs.sgml
Makefile.am | 6 +-
NEWS | 37 +
README.in | 18 +-
config.h.win32.in | 10 +-
configure.in | 274 ++--
docs/reference/gio/gio-docs.xml | 20 +-
docs/reference/gio/gio-sections.txt | 18 +
docs/reference/gio/gio.types | 1 +
docs/reference/glib/building.sgml | 4 +
docs/reference/glib/changes.sgml | 4 +
docs/reference/glib/compiling.sgml | 4 +
docs/reference/glib/cross.sgml | 4 +
docs/reference/glib/glib-docs.sgml | 303 ++---
docs/reference/glib/regex-syntax.sgml | 4 +
docs/reference/glib/resources.sgml | 4 +
docs/reference/glib/running.sgml | 4 +
docs/reference/glib/tmpl/threads.sgml | 63 +-
docs/reference/gobject/gobject-docs.sgml | 131 +-
docs/reference/gobject/gobject-sections.txt | 2 +
docs/reference/gobject/tut_gobject.xml | 3 +
docs/reference/gobject/tut_gsignal.xml | 3 +
docs/reference/gobject/tut_gtype.xml | 5 +-
docs/reference/gobject/tut_howto.xml | 21 +-
docs/reference/gobject/tut_intro.xml | 3 +
docs/reference/gobject/tut_tools.xml | 221 ++--
gio-2.0.pc.in | 2 +-
gio/Makefile.am | 17 +
gio/fam/Makefile.am | 15 +-
gio/fam/fam-module.c | 11 +
gio/gappinfo.c | 45 +-
gio/gasyncresult.c | 123 +-
gio/gcharsetconverter.c | 53 +-
gio/gcontenttype.c | 2 +-
gio/gconverter.c | 2 +-
gio/gdesktopappinfo.c | 58 +-
gio/gdrive.c | 175 +--
gio/gfile.c | 46 +-
gio/gfilterinputstream.c | 185 +---
gio/gfilteroutputstream.c | 173 ---
gio/gicon.c | 44 +-
gio/gio-querymodules.c | 133 ++
gio/gio.h | 1 +
gio/gio.symbols | 8 +
gio/gioenums.h | 6 +-
gio/giomodule.c | 241 +++-
gio/giomodule.h | 31 +
gio/giotypes.h | 1 +
gio/gloadableicon.c | 45 +-
gio/glocalfile.c | 2 +-
gio/gmemoryoutputstream.c | 308 +++--
gio/gmemoryoutputstream.h | 6 +-
gio/gmount.c | 143 +--
gio/gnetworkingprivate.h | 2 +-
gio/gresolver.c | 4 +-
gio/gseekable.c | 38 +-
gio/gsimpleasyncresult.c | 220 ++--
gio/gunixconnection.h | 3 +-
gio/gunixfdmessage.c | 2 +-
gio/gutf8inputstream.c | 327 +++++
gio/gutf8inputstream.h | 80 +
gio/gvolume.c | 103 +-
gio/gwin32resolver.c | 8 +
gio/libasyncns/asyncns.c | 94 +-
gio/libasyncns/g-asyncns.h | 16 +-
gio/tests/.gitignore | 26 +-
gio/tests/Makefile.am | 4 +
gio/tests/buffered-input-stream.c | 83 ++-
gio/tests/memory-output-stream.c | 37 +
gio/tests/utf8-input-stream.c | 252 ++++
glib/.gitignore | 1 +
glib/Makefile.am | 8 +-
glib/garray.c | 18 +-
glib/gatomic-gcc.c | 92 ++
glib/gdate.c | 2 +-
glib/gmarkup.c | 2 +-
glib/gtester-report | 2 +-
glib/gtestutils.c | 23 +
glib/gthread.h | 4 +
glib/gtimer.c | 7 +-
glib/gutils.c | 11 +-
glib/gutils.h | 2 +-
glib/gwin32.c | 4 +-
glib/tests/array-test.c | 24 +
glib/tests/option-context.c | 6 -
gobject-2.0-uninstalled.pc.in | 2 +-
gobject-2.0.pc.in | 2 +-
gobject/.gitignore | 1 +
gobject/Makefile.am | 7 +-
gobject/gatomicarray.c | 2 +-
gobject/genums.c | 6 +-
gobject/gobject.c | 16 +-
gobject/gsignal.c | 24 +-
gobject/gtype.c | 33 +-
gobject/gtype.h | 70 +-
gobject/gvalue.c | 2 +-
gobject/gvaluecollector.h | 43 +-
gobject/tests/.gitignore | 1 +
gobject/tests/threadtests.c | 38 +-
gthread/gthread-impl.c | 7 +-
po/LINGUAS | 1 +
po/am.po | 80 +-
po/ar.po | 80 +-
po/as.po | 80 +-
po/ast.po | 2084 +++++++++++++++++++++++++++
po/az.po | 80 +-
po/be.po | 80 +-
po/be latin po | 80 +-
po/bg.po | 80 +-
po/bn.po | 80 +-
po/bn_IN.po | 80 +-
po/bs.po | 80 +-
po/ca.po | 80 +-
po/ca valencia po | 80 +-
po/cs.po | 80 +-
po/cy.po | 372 +++---
po/da.po | 80 +-
po/de.po | 80 +-
po/dz.po | 80 +-
po/el.po | 80 +-
po/en shaw po | 80 +-
po/en_CA.po | 80 +-
po/en_GB.po | 80 +-
po/eo.po | 80 +-
po/es.po | 950 +++++++------
po/et.po | 25 +-
po/eu.po | 1044 +++++++-------
po/fa.po | 80 +-
po/fi.po | 80 +-
po/fr.po | 80 +-
po/ga.po | 80 +-
po/gl.po | 80 +-
po/gu.po | 80 +-
po/he.po | 111 +-
po/hi.po | 80 +-
po/hr.po | 80 +-
po/hu.po | 80 +-
po/hy.po | 80 +-
po/id.po | 80 +-
po/is.po | 80 +-
po/it.po | 80 +-
po/ja.po | 80 +-
po/ka.po | 80 +-
po/kn.po | 80 +-
po/ko.po | 80 +-
po/ku.po | 80 +-
po/lt.po | 80 +-
po/lv.po | 80 +-
po/mai.po | 80 +-
po/mg.po | 80 +-
po/mk.po | 80 +-
po/ml.po | 80 +-
po/mn.po | 80 +-
po/mr.po | 80 +-
po/ms.po | 80 +-
po/nb.po | 969 +++++++------
po/ne.po | 80 +-
po/nl.po | 80 +-
po/nn.po | 80 +-
po/oc.po | 80 +-
po/or.po | 80 +-
po/pa.po | 80 +-
po/pl.po | 80 +-
po/ps.po | 80 +-
po/pt.po | 80 +-
po/pt_BR.po | 80 +-
po/ro.po | 80 +-
po/ru.po | 80 +-
po/rw.po | 80 +-
po/si.po | 80 +-
po/sk.po | 80 +-
po/sl.po | 80 +-
po/sq.po | 80 +-
po/sr.po | 80 +-
po/sr ije po | 80 +-
po/sr latin po | 80 +-
po/sv.po | 1354 +++++++++---------
po/ta.po | 80 +-
po/te.po | 80 +-
po/th.po | 115 +-
po/tl.po | 80 +-
po/tr.po | 80 +-
po/tt.po | 80 +-
po/uk.po | 948 ++++++------
po/vi.po | 505 ++++----
po/wa.po | 80 +-
po/xh.po | 80 +-
po/yi.po | 80 +-
po/zh_CN.po | 80 +-
po/zh_HK.po | 80 +-
po/zh_TW.po | 80 +-
tests/.gitignore | 1 +
tests/Makefile.am | 6 +-
tests/assert-msg-test.c | 8 +
tests/gobject/performance.c | 6 -
tests/gobject/run-performance.sh | 3 +-
tests/run-assert-msg-test.sh | 48 +
tests/slice-concurrent.c | 2 +-
tests/slice-test.c | 2 +-
198 files changed, 11349 insertions(+), 8327 deletions(-)
---
diff --cc configure.in
index 6f8abf0,b5d9879..08b5a44
--- a/configure.in
+++ b/configure.in
@@@ -2516,32 -2541,9 +2541,35 @@@ els
fi
fi
+dnl ************************
+dnl ** Check for futex(2) **
+dnl ************************
+AC_MSG_CHECKING([for futex(2) system call])
+AC_COMPILE_IFELSE([
+#include <linux/futex.h>
+#include <syscall.h>
+#include <unistd.h>
+
+int
+main (void)
+{
+ /* it's not like this actually runs or anything... */
+ syscall (SYS_futex, NULL, FUTEX_WAKE, FUTEX_WAIT);
+ return 0;
+}
+],
+[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_FUTEX, [test "$have_futex" = "yes"],
+ [we have the futex(2) system call])
+],
+[
+ AC_MSG_RESULT(no)
+])
+
+ AM_CONDITIONAL(HAVE_GCC_BUILTINS_FOR_ATOMIC_OPERATIONS,
+ [test $glib_cv_gcc_has_builtin_atomic_operations = yes])
+
dnl ****************************************
dnl *** GLib POLL* compatibility defines ***
dnl ****************************************
diff --cc docs/reference/glib/glib-docs.sgml
index 83496f5,2bd1dcd..e6859b6
--- a/docs/reference/glib/glib-docs.sgml
+++ b/docs/reference/glib/glib-docs.sgml
@@@ -181,30 -98,27 +98,30 @@@ synchronize their operation
<chapter id="glib-data-types">
<title>GLib Data Types</title>
- &glib-Memory-Slices;
- &glib-Memory-Chunks;
- &glib-Doubly-Linked-Lists;
- &glib-Singly-Linked-Lists;
- &glib-Double-ended-Queues;
- &glib-Sequences;
- &glib-Trash-Stacks;
- &glib-Hash-Tables;
- &glib-Strings;
- &glib-String-Chunks;
- &glib-Arrays;
- &glib-Pointer-Arrays;
- &glib-Byte-Arrays;
- &glib-Balanced-Binary-Trees;
- &glib-N-ary-Trees;
- &glib-Quarks;
- &glib-Keyed-Data-Lists;
- &glib-Datasets;
- &glib-Relations-and-Tuples;
- &glib-Caches;
- &glib-Memory-Allocators;
- &glib-GVariantType;
- &glib-GVariant;
- &gvariant-varargs;
+ <xi:include href="xml/memory_slices.xml" />
+ <xi:include href="xml/memory_chunks.xml" />
+ <xi:include href="xml/linked_lists_double.xml" />
+ <xi:include href="xml/linked_lists_single.xml" />
+ <xi:include href="xml/queue.xml" />
+ <xi:include href="xml/sequence.xml" />
+ <xi:include href="xml/trash_stack.xml" />
+ <xi:include href="xml/hash_tables.xml" />
+ <xi:include href="xml/strings.xml" />
+ <xi:include href="xml/string_chunks.xml" />
+ <xi:include href="xml/arrays.xml" />
+ <xi:include href="xml/arrays_pointer.xml" />
+ <xi:include href="xml/arrays_byte.xml" />
+ <xi:include href="xml/trees-binary.xml" />
+ <xi:include href="xml/trees-nary.xml" />
+ <xi:include href="xml/quarks.xml" />
+ <xi:include href="xml/datalist.xml" />
+ <xi:include href="xml/datasets.xml" />
+ <xi:include href="xml/relations.xml" />
+ <xi:include href="xml/caches.xml" />
+ <xi:include href="xml/allocators.xml" />
++ <xi:include href="xml/gvarianttype.xml"/>
++ <xi:include href="xml/gvariant.xml"/>
++ <xi:include href="gvariant-varargs.xml"/>
</chapter>
<chapter id="tools">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
