X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2Foverride.c;h=b216dfeda00106d40fea1bf4f5cfc627dad7d23a;hb=98ad3f3cb54dba78cb1b5d2f5d84052b5274c430;hp=2385f2b27321b35b97e058f7d5b7b3cc333662c9;hpb=2dde53c525ed5c9a8d74bb8a85e3ea8ead1dcd11;p=vlc

diff --git a/bin/override.c b/bin/override.c
index 2385f2b273..b216dfeda0 100644
--- a/bin/override.c
+++ b/bin/override.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * override.c: overriden function calls for VLC media player
+ * override.c: overridden function calls for VLC media player
  *****************************************************************************
  * Copyright (C) 2010 Rémi Denis-Courmont
  *
@@ -111,22 +111,10 @@ static void *getsym (const char *name)
 
 /* Evil non-standard GNU C macro ;)
  *  typeof keyword,
- *  statement-expression,
- *  nested function...
+ *  statement-expression
  */
 #define CALL(func, ...) \
-({ \
-    static typeof (func) *sym = NULL; \
-    static pthread_once_t once = PTHREAD_ONCE_INIT; \
-    auto void getsym_once (void); \
-    void getsym_once (void) \
-    { \
-        sym = getsym ( # func); \
-    } \
-    pthread_once (&once, getsym_once); \
-    sym (__VA_ARGS__); \
-})
-
+({ typeof (func) *sym = getsym ( # func); sym (__VA_ARGS__); })
 
 /*** Environment ***
  *
@@ -201,6 +189,7 @@ int rand (void)
 }
 
 
+#if 0
 /** Signals **/
 #include <signal.h>
 
@@ -252,6 +241,7 @@ error:
     LOG("Blocked", "%d, %p, %p", signum, act, old);
     return -1;
 }
+#endif
 
 
 /*** Locales ***