diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-21 11:26:12 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-21 11:26:12 -0300 |
| commit | c0bcbcf4015ba2388cb0f0bd418e5242f9613b43 (patch) | |
| tree | 8e4f525a74e1ec4d373256b380f7d49305ed5d00 /extra/libart-lgpl | |
| parent | a05bf04c686ff44fc6c12fbe774d65032b74c55d (diff) | |
| parent | 11484c032f8c236b2044e715a9a3b28e33f65598 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/6tunnel/PKGBUILD
community/chrootuid/PKGBUILD
community/cpulimit/PKGBUILD
community/cutter/PKGBUILD
community/darkhttpd/PKGBUILD
community/darkstat/PKGBUILD
community/datemath/PKGBUILD
community/delegate/PKGBUILD
community/dfm/PKGBUILD
community/freedroid/PKGBUILD
community/parano/PKGBUILD
community/pyvorbis/PKGBUILD
community/scrotwm/PKGBUILD
extra/antlr2/PKGBUILD
extra/live-media/PKGBUILD
extra/mono-zeroconf/PKGBUILD
extra/vlc/PKGBUILD
Diffstat (limited to 'extra/libart-lgpl')
| -rw-r--r-- | extra/libart-lgpl/art_misc.h-cplusplus.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/extra/libart-lgpl/art_misc.h-cplusplus.patch b/extra/libart-lgpl/art_misc.h-cplusplus.patch deleted file mode 100644 index dea8eb0a0..000000000 --- a/extra/libart-lgpl/art_misc.h-cplusplus.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: art_misc.h -=================================================================== ---- art_misc.h (revision 277) -+++ art_misc.h (working copy) -@@ -34,9 +34,15 @@ - #include <libart_lgpl/art_config.h> - #endif - -+#ifdef __cplusplus -+extern "C" { -+#endif - void *art_alloc(size_t size); - void art_free(void *ptr); - void *art_realloc(void *ptr, size_t size); -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ - - /* These aren't, strictly speaking, configuration macros, but they're - damn handy to have around, and may be worth playing with for -Index: ChangeLog -=================================================================== ---- ChangeLog (revision 277) -+++ ChangeLog (working copy) -@@ -1,3 +1,10 @@ -+2007-03-01 Frederic Crozat <fcrozat@mandriva.com> -+ -+ reviewed by: Dom Lachowicz <cinamod@hotmail.com> -+ -+ * art_misc.h: Fix header when included in C++. -+ Patch from Goetz Waschk and Laurent Montel. -+ - 2007-02-28 Kjartan Maraas <kmaraas@gnome.org> - - configure.in: Release 2.3.19 |