Rev 3564: Pass extra arguments for extensions, and supply WIN32 macro for pyrex. in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/win32_find_files

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/win32_find_files

------------------------------------------------------------
revno: 3564
revision-id: john at arbash-meinel.com-20080717202107-f1jtymylhqnsr910
parent: john at arbash-meinel.com-20080717201643-qrbe6thvki1izwig
author: Alexander Belchenko <bialix at ukr.net>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_find_files
timestamp: Thu 2008-07-17 15:21:07 -0500
message:
  Pass extra arguments for extensions, and supply WIN32 macro for pyrex.
-------------- next part --------------
=== modified file 'setup.py'
--- a/setup.py	2008-07-17 12:55:11 +0000
+++ b/setup.py	2008-07-17 20:21:07 +0000
@@ -216,18 +216,22 @@
     pyrex_name = path + '.pyx'
     c_name = path + '.c'
     if have_pyrex:
-        ext_modules.append(Extension(module_name, [pyrex_name]))
+        ext_modules.append(Extension(module_name, [pyrex_name], **kwargs))
     else:
         if not os.path.isfile(c_name):
             unavailable_files.append(c_name)
         else:
-            ext_modules.append(Extension(module_name, [c_name]))
+            ext_modules.append(Extension(module_name, [c_name], **kwargs))
 
 
 add_pyrex_extension('bzrlib._dirstate_helpers_c')
 add_pyrex_extension('bzrlib._knit_load_data_c')
 if sys.platform == 'win32':
-    add_pyrex_extension('bzrlib._walkdirs_win32')
+    # pyrex uses the macro WIN32 to detect the platform, even though it should
+    # be using something like _WIN32 or MS_WINDOWS, oh well, we can give it the
+    # right value.
+    add_pyrex_extension('bzrlib._walkdirs_win32',
+                        define_macro=[('WIN32', None)])
 ext_modules.append(Extension('bzrlib._patiencediff_c', ['bzrlib/_patiencediff_c.c']))