summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2009-09-27 23:53:01 +0000
committerMart Raudsepp <leio@gentoo.org>2009-09-27 23:53:01 +0000
commitacb52315729183d9a49f90e3cf32656da2f75dbd (patch)
tree75a6cca3fff4d0fbcad74d38258bd4ebc620a3a8 /gnome-base/gnome-keyring/files
parentClean up old revision. (diff)
downloadgentoo-2-acb52315729183d9a49f90e3cf32656da2f75dbd.tar.gz
gentoo-2-acb52315729183d9a49f90e3cf32656da2f75dbd.tar.bz2
gentoo-2-acb52315729183d9a49f90e3cf32656da2f75dbd.zip
Fix public headers to work with C++ code in the 2.22 series too
(Portage version: 2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64)
Diffstat (limited to 'gnome-base/gnome-keyring/files')
-rw-r--r--gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-headers-fix-for-cxx.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-headers-fix-for-cxx.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-headers-fix-for-cxx.patch
new file mode 100644
index 000000000000..58b382a26157
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-headers-fix-for-cxx.patch
@@ -0,0 +1,49 @@
+commit 1fe0f7817e3eaa19103b70a09c4fb9d9837fbb93
+Author: Stefan Walter <stefw@src.gnome.org>
+Date: Wed Feb 11 15:00:38 2009 +0000
+
+ Add G_BEGIN_DECLS/G_END_DECLS so the library can be used with a C++
+ compiler.
+
+ svn path=/trunk/; revision=1554
+
+diff --git a/library/gnome-keyring-memory.h b/library/gnome-keyring-memory.h
+index babf958..64f988b 100644
+--- a/library/gnome-keyring-memory.h
++++ b/library/gnome-keyring-memory.h
+@@ -26,6 +26,8 @@
+
+ #include <glib.h>
+
++G_BEGIN_DECLS
++
+ /**
+ * gnome-keyring-memory:Short_Description:
+ *
+@@ -59,4 +61,6 @@ gboolean gnome_keyring_memory_is_secure (gpointer p);
+
+ gchar* gnome_keyring_memory_strdup (const gchar* str);
+
++G_END_DECLS
++
+ #endif /* GNOME_KEYRING_MEMORY_H */
+diff --git a/library/gnome-keyring.h b/library/gnome-keyring.h
+index 628bf8e..dc19a4c 100644
+--- a/library/gnome-keyring.h
++++ b/library/gnome-keyring.h
+@@ -29,6 +29,8 @@
+
+ #include "gnome-keyring-result.h"
+
++G_BEGIN_DECLS
++
+ #define GNOME_KEYRING_SESSION "session"
+ #define GNOME_KEYRING_DEFAULT NULL
+
+@@ -516,4 +518,6 @@ GnomeKeyringResult gnome_keyring_daemon_set_display_sync (const char
+
+ GnomeKeyringResult gnome_keyring_daemon_prepare_environment_sync (void);
+
++G_END_DECLS
++
+ #endif /* GNOME_KEYRING_H */