Forráskód Böngészése

misc/dead.h: fix name conflicts with Android toolchain

ambrop7 13 éve
szülő
commit
3c4f0f741c
1 módosított fájl, 8 hozzáadás és 8 törlés
  1. 8 8
      misc/dead.h

+ 8 - 8
misc/dead.h

@@ -96,7 +96,7 @@ typedef int *dead_t;
 /**
  * Declares dead catching variables.
  */
-#define DEAD_DECLARE int __dead; dead_t __prev_ptr;
+#define DEAD_DECLARE int badvpn__dead; dead_t badvpn__prev_ptr;
 
 /**
  * Enters a dead catching using already declared dead catching variables.
@@ -104,7 +104,7 @@ typedef int *dead_t;
  * and {@link DEAD_KILL} must not have been called yet.
  * {@link DEAD_LEAVE2} must be called before the current scope is left.
  */
-#define DEAD_ENTER2(ptr) { __dead = 0; __prev_ptr = ptr; ptr = &__dead; }
+#define DEAD_ENTER2(ptr) { badvpn__dead = 0; badvpn__prev_ptr = ptr; ptr = &badvpn__dead; }
 
 /**
  * Declares dead catching variables and enters a dead catching.
@@ -117,18 +117,18 @@ typedef int *dead_t;
 /**
  * Leaves a dead catching.
  */
-#define DEAD_LEAVE2(ptr) { if (!__dead) ptr = __prev_ptr; if (__prev_ptr) *__prev_ptr = __dead; }
+#define DEAD_LEAVE2(ptr) { if (!badvpn__dead) ptr = badvpn__prev_ptr; if (badvpn__prev_ptr) *badvpn__prev_ptr = badvpn__dead; }
 
 /**
  * Returns 1 if {@link DEAD_KILL} was called for the dead variable, 0 otherwise.
  * Must be called after entering a dead catching.
  */
-#define DEAD_KILLED (__dead)
+#define DEAD_KILLED (badvpn__dead)
 
-#define DEAD_DECLARE_N(n) int __dead##n; dead_t __prev_ptr##n;
-#define DEAD_ENTER2_N(n, ptr) { __dead##n = 0; __prev_ptr##n = ptr; ptr = &__dead##n;}
+#define DEAD_DECLARE_N(n) int badvpn__dead##n; dead_t badvpn__prev_ptr##n;
+#define DEAD_ENTER2_N(n, ptr) { badvpn__dead##n = 0; badvpn__prev_ptr##n = ptr; ptr = &badvpn__dead##n;}
 #define DEAD_ENTER_N(n, ptr) DEAD_DECLARE_N(n) DEAD_ENTER2_N(n, ptr)
-#define DEAD_LEAVE2_N(n, ptr) { if (!__dead##n) ptr = __prev_ptr##n; if (__prev_ptr##n) *__prev_ptr##n = __dead##n; }
-#define DEAD_KILLED_N(n) (__dead##n)
+#define DEAD_LEAVE2_N(n, ptr) { if (!badvpn__dead##n) ptr = badvpn__prev_ptr##n; if (badvpn__prev_ptr##n) *badvpn__prev_ptr##n = badvpn__dead##n; }
+#define DEAD_KILLED_N(n) (badvpn__dead##n)
 
 #endif