[pypy-svn] r54955 - pypy/branch/win32port/pypy/rlib

afa at codespeak.net afa at codespeak.net
Mon May 19 18:48:51 CEST 2008


Author: afa
Date: Mon May 19 18:48:50 2008
New Revision: 54955

Modified:
   pypy/branch/win32port/pypy/rlib/rmmap.py
   pypy/branch/win32port/pypy/rlib/rsocket.py
   pypy/branch/win32port/pypy/rlib/rwin32.py
Log:
Move some definitions from rmmap to rwin32


Modified: pypy/branch/win32port/pypy/rlib/rmmap.py
==============================================================================
--- pypy/branch/win32port/pypy/rlib/rmmap.py	(original)
+++ pypy/branch/win32port/pypy/rlib/rmmap.py	Mon May 19 18:48:50 2008
@@ -38,19 +38,7 @@
     size_t = rffi_platform.SimpleType("size_t", rffi.LONG)
     off_t = rffi_platform.SimpleType("off_t", rffi.LONG)
     if _MS_WINDOWS:
-        DWORD_PTR = rffi_platform.SimpleType("DWORD_PTR", rffi.LONG)
-        WORD = rffi_platform.SimpleType("WORD", rffi.UINT)
-        DWORD = rffi_platform.SimpleType("DWORD", rffi.ULONG)
-        BOOL = rffi_platform.SimpleType("BOOL", rffi.LONG)
-        INT = rffi_platform.SimpleType("INT", rffi.INT)
-        LONG = rffi_platform.SimpleType("LONG", rffi.LONG)
-        PLONG = rffi_platform.SimpleType("PLONG", rffi.LONGP)
-        LPVOID = rffi_platform.SimpleType("LPVOID", rffi.INTP)
-        LPCVOID = rffi_platform.SimpleType("LPCVOID", rffi.VOIDP)
-        LPCTSTR = rffi_platform.SimpleType("LPCTSTR", rffi.CCHARP)
-        LPDWORD = rffi_platform.SimpleType("LPDWORD", rffi.INTP)
         LPSECURITY_ATTRIBUTES = rffi_platform.SimpleType("LPSECURITY_ATTRIBUTES", rffi.CCHARP)
-        SIZE_T = rffi_platform.SimpleType("SIZE_T", rffi.SIZE_T)
 
 constants = {}
 if _POSIX:
@@ -80,8 +68,10 @@
     for name in constant_names:
         setattr(CConfig, name, rffi_platform.ConstantInteger(name))
 
-    HANDLE = rffi.ULONG
-    LPHANDLE = rffi.CArrayPtr(HANDLE)
+    from pypy.rlib.rwin32 import HANDLE, LPHANDLE
+    from pypy.rlib.rwin32 import DWORD, WORD, DWORD_PTR, LPDWORD
+    from pypy.rlib.rwin32 import BOOL, LPVOID, LPCVOID, LPCTSTR, SIZE_T
+    from pypy.rlib.rwin32 import INT, LONG, PLONG
 
 # export the constants inside and outside. see __init__.py
 cConfig = rffi_platform.configure(CConfig)

Modified: pypy/branch/win32port/pypy/rlib/rsocket.py
==============================================================================
--- pypy/branch/win32port/pypy/rlib/rsocket.py	(original)
+++ pypy/branch/win32port/pypy/rlib/rsocket.py	Mon May 19 18:48:50 2008
@@ -153,8 +153,7 @@
                            flags=AI_PASSIVE,
                            address_to_fill=result)
         if len(info) > 1:
-            raise RSocketError("wildcard resolved to "
-                               "multiple addresses")
+            raise RSocketError("wildcard resolved to multiple addresses")
         return info[0][4]
 
     # IPv4 also supports the special name "<broadcast>".

Modified: pypy/branch/win32port/pypy/rlib/rwin32.py
==============================================================================
--- pypy/branch/win32port/pypy/rlib/rwin32.py	(original)
+++ pypy/branch/win32port/pypy/rlib/rwin32.py	Mon May 19 18:48:50 2008
@@ -23,11 +23,20 @@
     _compilation_info_ = eci
 
     if WIN32:
+        DWORD_PTR = rffi_platform.SimpleType("DWORD_PTR", rffi.LONG)
+        WORD = rffi_platform.SimpleType("WORD", rffi.UINT)
         DWORD = rffi_platform.SimpleType("DWORD", rffi.UINT)
         BOOL = rffi_platform.SimpleType("BOOL", rffi.LONG)
-        HRESULT = rffi_platform.SimpleType("HRESULT", rffi.LONG)
+        INT = rffi_platform.SimpleType("INT", rffi.INT)
+        LONG = rffi_platform.SimpleType("LONG", rffi.LONG)
+        PLONG = rffi_platform.SimpleType("PLONG", rffi.LONGP)
+        LPVOID = rffi_platform.SimpleType("LPVOID", rffi.INTP)
+        LPCVOID = rffi_platform.SimpleType("LPCVOID", rffi.VOIDP)
+        LPCTSTR = rffi_platform.SimpleType("LPCTSTR", rffi.CCHARP)
+        LPDWORD = rffi_platform.SimpleType("LPDWORD", rffi.INTP)
+        SIZE_T = rffi_platform.SimpleType("SIZE_T", rffi.SIZE_T)
 
-        HANDLE = rffi_platform.SimpleType("HANDLE", rffi.VOIDP)
+        HRESULT = rffi_platform.SimpleType("HRESULT", rffi.LONG)
         HLOCAL = rffi_platform.SimpleType("HLOCAL", rffi.VOIDP)
 
         DEFAULT_LANGUAGE = rffi_platform.ConstantInteger(
@@ -45,6 +54,9 @@
     return rffi.llexternal(name, args, result, compilation_info=eci, calling_conv='win')
 
 if WIN32:
+    HANDLE = rffi.ULONG
+    LPHANDLE = rffi.CArrayPtr(HANDLE)
+
     GetLastError = winexternal('GetLastError', [], DWORD)
 
     LoadLibrary = winexternal('LoadLibraryA', [rffi.CCHARP], rffi.VOIDP)



More information about the Pypy-commit mailing list