[pypy-commit] pypy kill-exported-symbols-list: fixfixfix

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: kill-exported-symbols-list
Changeset: r74110:f3a7cebf1c70
Date: 2014-10-23 13:49 +0200
http://bitbucket.org/pypy/pypy/changeset/f3a7cebf1c70/

Log:	fixfixfix

diff --git a/pypy/module/_ssl/thread_lock.py b/pypy/module/_ssl/thread_lock.py
--- a/pypy/module/_ssl/thread_lock.py
+++ b/pypy/module/_ssl/thread_lock.py
@@ -65,8 +65,7 @@
 eci = rthread.eci.merge(ExternalCompilationInfo(
     separate_module_sources=[separate_module_source],
     post_include_bits=[
-        "int _PyPy_SSL_SetupThreads(void);"],
-    export_symbols=['_PyPy_SSL_SetupThreads'],
+        "RPY_EXPORTED_FOR_TESTS int _PyPy_SSL_SetupThreads(void);"],
     libraries = libraries,
 ))
 
diff --git a/rpython/rlib/rgil.py b/rpython/rlib/rgil.py
--- a/rpython/rlib/rgil.py
+++ b/rpython/rlib/rgil.py
@@ -10,9 +10,7 @@
 eci = ExternalCompilationInfo(
     includes = ['src/thread.h'],
     separate_module_files = [translator_c_dir / 'src' / 'thread.c'],
-    include_dirs = [translator_c_dir],
-    export_symbols = ['RPyGilAllocate', 'RPyGilYieldThread', 'RPyGilRelease',
-                      'RPyGilAcquire', 'RPyFetchFastGil'])
+    include_dirs = [translator_c_dir])
 
 llexternal = rffi.llexternal
 
diff --git a/rpython/rlib/ropenssl.py b/rpython/rlib/ropenssl.py
--- a/rpython/rlib/ropenssl.py
+++ b/rpython/rlib/ropenssl.py
@@ -34,7 +34,6 @@
 eci = ExternalCompilationInfo(
     libraries = libraries,
     includes = includes,
-    export_symbols = [],
     post_include_bits = [
         # Unnamed structures are not supported by rffi_platform.
         # So we replace an attribute access with a macro call.
@@ -171,8 +170,6 @@
 
 def external(name, argtypes, restype, **kw):
     kw['compilation_info'] = eci
-    if not kw.get('macro', False):
-        eci.export_symbols += (name,)
     return rffi.llexternal(
         name, argtypes, restype, **kw)
 
diff --git a/rpython/translator/c/src/thread.h b/rpython/translator/c/src/thread.h
--- a/rpython/translator/c/src/thread.h
+++ b/rpython/translator/c/src/thread.h
@@ -26,9 +26,9 @@
 
 #endif /* !_WIN32 */
 
-void RPyGilAllocate(void);
-long RPyGilYieldThread(void);
-void RPyGilAcquire(void);
+RPY_EXPORTED_FOR_TESTS void RPyGilAllocate(void);
+RPY_EXPORTED_FOR_TESTS long RPyGilYieldThread(void);
+RPY_EXPORTED_FOR_TESTS void RPyGilAcquire(void);
 #define RPyGilRelease _RPyGilRelease
 #define RPyFetchFastGil _RPyFetchFastGil
 
diff --git a/rpython/translator/c/src/thread_nt.h b/rpython/translator/c/src/thread_nt.h
--- a/rpython/translator/c/src/thread_nt.h
+++ b/rpython/translator/c/src/thread_nt.h
@@ -14,14 +14,21 @@
 /* prototypes */
 RPY_EXPORTED_FOR_TESTS
 long RPyThreadGetIdent(void);
+RPY_EXPORTED_FOR_TESTS
 long RPyThreadStart(void (*func)(void));
 RPY_EXPORTED_FOR_TESTS
 int RPyThreadLockInit(struct RPyOpaque_ThreadLock *lock);
+RPY_EXPORTED_FOR_TESTS
 void RPyOpaqueDealloc_ThreadLock(struct RPyOpaque_ThreadLock *lock);
+RPY_EXPORTED_FOR_TESTS
 int RPyThreadAcquireLock(struct RPyOpaque_ThreadLock *lock, int waitflag);
+RPY_EXPORTED_FOR_TESTS
 RPyLockStatus RPyThreadAcquireLockTimed(struct RPyOpaque_ThreadLock *lock,
 					RPY_TIMEOUT_T timeout, int intr_flag);
+RPY_EXPORTED_FOR_TESTS
 void RPyThreadReleaseLock(struct RPyOpaque_ThreadLock *lock);
+RPY_EXPORTED_FOR_TESTS
 long RPyThreadGetStackSize(void);
+RPY_EXPORTED_FOR_TESTS
 long RPyThreadSetStackSize(long);
 #endif
diff --git a/rpython/translator/c/src/thread_pthread.h b/rpython/translator/c/src/thread_pthread.h
--- a/rpython/translator/c/src/thread_pthread.h
+++ b/rpython/translator/c/src/thread_pthread.h
@@ -61,14 +61,22 @@
 
 RPY_EXPORTED_FOR_TESTS
 long RPyThreadGetIdent(void);
+RPY_EXPORTED_FOR_TESTS
 long RPyThreadStart(void (*func)(void));
 RPY_EXPORTED_FOR_TESTS
 int RPyThreadLockInit(struct RPyOpaque_ThreadLock *lock);
+RPY_EXPORTED_FOR_TESTS
 void RPyOpaqueDealloc_ThreadLock(struct RPyOpaque_ThreadLock *lock);
+RPY_EXPORTED_FOR_TESTS
 int RPyThreadAcquireLock(struct RPyOpaque_ThreadLock *lock, int waitflag);
+RPY_EXPORTED_FOR_TESTS
 RPyLockStatus RPyThreadAcquireLockTimed(struct RPyOpaque_ThreadLock *lock,
 					RPY_TIMEOUT_T timeout, int intr_flag);
+RPY_EXPORTED_FOR_TESTS
 void RPyThreadReleaseLock(struct RPyOpaque_ThreadLock *lock);
+RPY_EXPORTED_FOR_TESTS
 long RPyThreadGetStackSize(void);
+RPY_EXPORTED_FOR_TESTS
 long RPyThreadSetStackSize(long);
+RPY_EXPORTED_FOR_TESTS
 void RPyThreadAfterFork(void);