summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch')
-rw-r--r--media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch60
1 files changed, 0 insertions, 60 deletions
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch b/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch
deleted file mode 100644
index 9267c5a954c5..000000000000
--- a/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-http://pkgs.fedoraproject.org/gitweb/?p=libvisual.git;a=tree
-
---- a/libvisual/lv_cache.c
-+++ b/libvisual/lv_cache.c
-@@ -32,7 +32,7 @@
- static int cache_dtor (VisObject *object);
- static int cache_remove_list_entry (VisCache *cache, VisListEntry **le);
-
--static inline void handle_request_reset (VisCache *cache, VisListEntry *le);
-+static lv_inline void handle_request_reset (VisCache *cache, VisListEntry *le);
-
- static int cache_dtor (VisObject *object)
- {
-@@ -74,7 +74,7 @@
- }
-
-
--static inline void handle_request_reset (VisCache *cache, VisListEntry *le)
-+static lv_inline void handle_request_reset (VisCache *cache, VisListEntry *le)
- {
- VisCacheEntry *centry;
-
---- a/libvisual/lv_defines.h
-+++ b/libvisual/lv_defines.h
-@@ -63,13 +63,13 @@
-
- /* Compiler specific optimalization macros */
- #if __GNUC__ >= 3
--# define inline inline __attribute__ ((always_inline))
-+# define lv_inline inline __attribute__ ((always_inline))
- # define __malloc __attribute__ ((malloc))
- # define __packed __attribute__ ((packed))
- # define VIS_LIKELY(x) __builtin_expect (!!(x), 1)
- # define VIS_UNLIKELY(x) __builtin_expect (!!(x), 0)
- #else
--# define inline /* no inline */
-+# define lv_inline /* no inline */
- # define __malloc /* no malloc */
- # define __packed /* no packed */
- # define VIS_LIKELY(x) (x)
---- a/libvisual/lv_time.h
-+++ b/libvisual/lv_time.h
-@@ -101,7 +101,7 @@
- *
- * @return Nothing.
- */
--static inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi)
-+static lv_inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi)
- {
- #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
- __asm __volatile
-@@ -115,7 +115,7 @@
- }
-
- /* FIXME use uint64_t here, make sure type exists */
--static inline unsigned long long visual_timer_tsc_get_returned ()
-+static lv_inline unsigned long long visual_timer_tsc_get_returned ()
- {
- uint32_t lo, hi;
-