libvisual/trunk/libvisual-0.4.0-inlinedefineconflict.patch

   1 diff -ru libvisual-0.4.0.orig/libvisual/lv_cache.c libvisual-0.4.0/libvisual/lv_cache.c
   2 --- libvisual-0.4.0.orig/libvisual/lv_cache.c   2009-03-07 17:17:38.000000000 +0000
   3 +++ libvisual-0.4.0/libvisual/lv_cache.c        2009-03-07 17:25:26.000000000 +0000
   4 @@ -32,7 +32,7 @@
   5  static int cache_dtor (VisObject *object);
   6  static int cache_remove_list_entry (VisCache *cache, VisListEntry **le);
   7
   8 -static inline void handle_request_reset (VisCache *cache, VisListEntry *le);
   9 +static lv_inline void handle_request_reset (VisCache *cache, VisListEntry *le);
  10
  11  static int cache_dtor (VisObject *object)
  12  {
  13 @@ -74,7 +74,7 @@
  14  }
  15
  16
  17 -static inline void handle_request_reset (VisCache *cache, VisListEntry *le)
  18 +static lv_inline void handle_request_reset (VisCache *cache, VisListEntry *le)
  19  {
  20         VisCacheEntry *centry;
  21
  22 diff -ru libvisual-0.4.0.orig/libvisual/lv_defines.h libvisual-0.4.0/libvisual/lv_defines.h
  23 --- libvisual-0.4.0.orig/libvisual/lv_defines.h 2009-03-07 17:17:38.000000000 +0000
  24 +++ libvisual-0.4.0/libvisual/lv_defines.h      2009-03-07 17:24:17.000000000 +0000
  25 @@ -63,13 +63,13 @@
  26
  27  /* Compiler specific optimalization macros */
  28  #if __GNUC__ >= 3
  29 -# define inline                        inline __attribute__ ((always_inline))
  30 +# define lv_inline             inline __attribute__ ((always_inline))
  31  # define __malloc              __attribute__ ((malloc))
  32  # define __packed              __attribute__ ((packed))
  33  # define VIS_LIKELY(x)         __builtin_expect (!!(x), 1)
  34  # define VIS_UNLIKELY(x)       __builtin_expect (!!(x), 0)
  35  #else
  36 -# define inline                        /* no inline */
  37 +# define lv_inline             /* no inline */
  38  # define __malloc              /* no malloc */
  39  # define __packed              /* no packed */
  40  # define VIS_LIKELY(x)         (x)
  41 diff -ru libvisual-0.4.0.orig/libvisual/lv_time.h libvisual-0.4.0/libvisual/lv_time.h
  42 --- libvisual-0.4.0.orig/libvisual/lv_time.h    2009-03-07 17:17:38.000000000 +0000
  43 +++ libvisual-0.4.0/libvisual/lv_time.h 2009-03-07 17:25:15.000000000 +0000
  44 @@ -101,7 +101,7 @@
  45   *
  46   * @return Nothing.
  47   */
  48 -static inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi)
  49 +static lv_inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi)
  50  {
  51  #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
  52         __asm __volatile
  53 @@ -115,7 +115,7 @@
  54  }
  55
  56  /* FIXME use uint64_t here, make sure type exists */
  57 -static inline unsigned long long visual_timer_tsc_get_returned ()
  58 +static lv_inline unsigned long long visual_timer_tsc_get_returned ()
  59  {
  60         uint32_t lo, hi;
  61