From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Fri, 22 Apr 2011 08:59:34 +0000 (+0100)
Subject: Remove redundant extern "C" clauses.
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=8f6be5674e4288af0db0c8bda008acffc2650afa;p=apitrace

Remove redundant extern "C" clauses.
---

diff --git a/glxtrace.py b/glxtrace.py
index 9e671d6..b7a8f66 100644
--- a/glxtrace.py
+++ b/glxtrace.py
@@ -59,8 +59,6 @@ if __name__ == '__main__':
     print '#include "glproc.hpp"'
     print '#include "glsize.hpp"'
     print
-    print 'extern "C" {'
-    print
     print 'static __GLXextFuncPtr __unwrap_proc_addr(const GLubyte * procName, __GLXextFuncPtr procPtr);'
     print
 
@@ -116,7 +114,8 @@ static void *__dlopen(const char *filename, int flag)
  * we need to intercept the dlopen() call here, and redirect to our wrapper
  * shared object.
  */
-void *dlopen(const char *filename, int flag)
+extern "C" void *
+dlopen(const char *filename, int flag)
 {
     void *handle;
 
@@ -148,8 +147,6 @@ void *dlopen(const char *filename, int flag)
     return handle;
 }
 
-} /* extern "C" */
-
 
 /*
  * Lookup a libGL symbol
diff --git a/wgltrace.py b/wgltrace.py
index 5ab4c0f..480ebcb 100644
--- a/wgltrace.py
+++ b/wgltrace.py
@@ -98,12 +98,8 @@ __getPublicProcAddress(LPCSTR lpProcName)
     print '#include "glproc.hpp"'
     print '#include "glsize.hpp"'
     print
-    print 'extern "C" {'
-    print
     api = API()
     api.add_api(glapi)
     api.add_api(wglapi)
     tracer = WglTracer()
     tracer.trace_api(api)
-    print
-    print '} /* extern "C" */'