external/libmariadb/mariadb-swap.patch

   1 --- mariadb/include/global.h    2013-03-06 17:06:42.545906061 +0100
   2 +++ mariadb/include/global.h    2013-03-07 14:45:03.811128674 +0100
   3 @@ -247,7 +247,9 @@
   4  #endif
   5
   6  #define sgn(a)         (((a) < 0) ? -1 : ((a) > 0) ? 1 : 0)
   7 +#ifndef __cplusplus
   8  #define swap(t,a,b)    { register t dummy; dummy = a; a = b; b = dummy; }
   9 +#endif
  10  #define test(a)                ((a) ? 1 : 0)
  11  #define set_if_bigger(a,b)  { if ((a) < (b)) (a)=(b); }
  12  #define set_if_smaller(a,b) { if ((a) > (b)) (a)=(b); }
  13 --- mariadb/include/my_global.h 2013-03-06 17:06:42.546906037 +0100
  14 +++ mariadb/include/my_global.h 2013-03-07 14:44:47.032529753 +0100
  15 @@ -278,7 +278,9 @@
  16  #endif
  17
  18  #define sgn(a)         (((a) < 0) ? -1 : ((a) > 0) ? 1 : 0)
  19 +#ifndef __cplusplus
  20  #define swap(t,a,b)    { register t dummy; dummy = a; a = b; b = dummy; }
  21 +#endif
  22  #define test(a)                ((a) ? 1 : 0)
  23  #define set_if_bigger(a,b)  { if ((a) < (b)) (a)=(b); }
  24  #define set_if_smaller(a,b) { if ((a) > (b)) (a)=(b); }