[Libreoffice-commits] .: scp2/source

[Stephan Bergmann]

 scp2/source/python/file_python.scp |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 2ea723e8ce4077c7efa957d278637c4d9f32cf14
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Feb 6 15:51:52 2012 +0100

    Revert "Mac OS X uses .dylib and not .so for python modules."
    
    This reverts commit b53a86a5676d5bcb88ed6e3ac524a3560e713c22.
    Conflicts:
    	scp2/source/python/file_python.scp
    
    I assume that the file *shall* be named .so on Mac OS X after all, and that it
    actually being named .dylib was a mistake introduced with
    a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe and reverted with
    0b1be1ce0e0ac7b34c4b73d53f4bf32ec5df7290.

diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index cdcd744..194394d 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -284,14 +284,10 @@ End
 
 #ifdef UNX
 
+// pyuno.so even on Mac OS X, because it is a python module
 File gid_File_Pyuno
     LIB_FILE_BODY;
-#ifdef MACOSX
-    // note: Mac OS X use .dylib, even for python modules
-    Name = "pyuno.dylib";
-#else
     Name = "pyuno.so";
-#endif
     Dir = gid_Brand_Dir_Program;
     Styles = (PACKED);
 End