From ac230392d740355f62fb5068fbac298b4ec9d42d Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Fri, 5 Dec 2014 14:54:30 +0300 Subject: [PATCH] put version (Windows) for all win32 files --- 3rdparty/win32/accctrl.d | 1 + 3rdparty/win32/aclapi.d | 1 + 3rdparty/win32/aclui.d | 1 + 3rdparty/win32/basetsd.d | 1 + 3rdparty/win32/basetyps.d | 1 + 3rdparty/win32/cderr.d | 1 + 3rdparty/win32/cguid.d | 1 + 3rdparty/win32/comcat.d | 1 + 3rdparty/win32/commctrl.d | 1 + 3rdparty/win32/commdlg.d | 1 + 3rdparty/win32/core.d | 1 + 3rdparty/win32/cpl.d | 1 + 3rdparty/win32/cplext.d | 1 + 3rdparty/win32/custcntl.d | 1 + 3rdparty/win32/dbt.d | 1 + 3rdparty/win32/dde.d | 1 + 3rdparty/win32/ddeml.d | 1 + 3rdparty/win32/dhcpcsdk.d | 1 + 3rdparty/win32/directx/d3d10.d | 1 + 3rdparty/win32/directx/d3d10effect.d | 1 + 3rdparty/win32/directx/d3d10misc.d | 1 + 3rdparty/win32/directx/d3d10shader.d | 1 + 3rdparty/win32/directx/d3d9.d | 1 + 3rdparty/win32/directx/d3d9caps.d | 1 + 3rdparty/win32/directx/d3d9types.d | 1 + 3rdparty/win32/directx/d3dx10.d | 1 + 3rdparty/win32/directx/d3dx10async.d | 1 + 3rdparty/win32/directx/d3dx10core.d | 1 + 3rdparty/win32/directx/d3dx10math.d | 1 + 3rdparty/win32/directx/d3dx10mesh.d | 1 + 3rdparty/win32/directx/d3dx10tex.d | 1 + 3rdparty/win32/directx/d3dx9.d | 1 + 3rdparty/win32/directx/dinput8.d | 1 + 3rdparty/win32/directx/dsound8.d | 1 + 3rdparty/win32/directx/dxerr.d | 1 + 3rdparty/win32/directx/dxerr8.d | 1 + 3rdparty/win32/directx/dxerr9.d | 1 + 3rdparty/win32/directx/dxgi.d | 1 + 3rdparty/win32/directx/dxgitype.d | 1 + 3rdparty/win32/dlgs.d | 1 + 3rdparty/win32/docobj.d | 1 + 3rdparty/win32/errorrep.d | 1 + 3rdparty/win32/exdisp.d | 1 + 3rdparty/win32/exdispid.d | 1 + 3rdparty/win32/httpext.d | 1 + 3rdparty/win32/idispids.d | 1 + 3rdparty/win32/imagehlp.d | 1 + 3rdparty/win32/imm.d | 1 + 3rdparty/win32/intshcut.d | 1 + 3rdparty/win32/ipexport.d | 1 + 3rdparty/win32/iphlpapi.d | 1 + 3rdparty/win32/ipifcons.d | 1 + 3rdparty/win32/iprtrmib.d | 1 + 3rdparty/win32/iptypes.d | 1 + 3rdparty/win32/isguids.d | 1 + 3rdparty/win32/lm.d | 1 + 3rdparty/win32/lmaccess.d | 1 + 3rdparty/win32/lmalert.d | 1 + 3rdparty/win32/lmapibuf.d | 1 + 3rdparty/win32/lmat.d | 1 + 3rdparty/win32/lmaudit.d | 1 + 3rdparty/win32/lmbrowsr.d | 1 + 3rdparty/win32/lmchdev.d | 1 + 3rdparty/win32/lmconfig.d | 1 + 3rdparty/win32/lmcons.d | 1 + 3rdparty/win32/lmerr.d | 1 + 3rdparty/win32/lmerrlog.d | 1 + 3rdparty/win32/lmmsg.d | 1 + 3rdparty/win32/lmremutl.d | 1 + 3rdparty/win32/lmrepl.d | 1 + 3rdparty/win32/lmserver.d | 1 + 3rdparty/win32/lmshare.d | 1 + 3rdparty/win32/lmsname.d | 1 + 3rdparty/win32/lmstats.d | 1 + 3rdparty/win32/lmsvc.d | 1 + 3rdparty/win32/lmuse.d | 1 + 3rdparty/win32/lmuseflg.d | 1 + 3rdparty/win32/lmwksta.d | 1 + 3rdparty/win32/lzexpand.d | 1 + 3rdparty/win32/mapi.d | 1 + 3rdparty/win32/mciavi.d | 1 + 3rdparty/win32/mcx.d | 1 + 3rdparty/win32/mgmtapi.d | 1 + 3rdparty/win32/mmsystem.d | 1 + 3rdparty/win32/msacm.d | 1 + 3rdparty/win32/mshtml.d | 1 + 3rdparty/win32/mswsock.d | 1 + 3rdparty/win32/nb30.d | 1 + 3rdparty/win32/nddeapi.d | 1 + 3rdparty/win32/nspapi.d | 1 + 3rdparty/win32/ntdef.d | 1 + 3rdparty/win32/ntdll.d | 1 + 3rdparty/win32/ntldap.d | 1 + 3rdparty/win32/ntsecapi.d | 1 + 3rdparty/win32/ntsecpkg.d | 1 + 3rdparty/win32/oaidl.d | 1 + 3rdparty/win32/objbase.d | 1 + 3rdparty/win32/objfwd.d | 1 + 3rdparty/win32/objidl.d | 1 + 3rdparty/win32/objsafe.d | 1 + 3rdparty/win32/ocidl.d | 1 + 3rdparty/win32/odbcinst.d | 1 + 3rdparty/win32/ole.d | 1 + 3rdparty/win32/ole2.d | 1 + 3rdparty/win32/ole2ver.d | 1 + 3rdparty/win32/oleacc.d | 1 + 3rdparty/win32/oleauto.d | 1 + 3rdparty/win32/olectl.d | 1 + 3rdparty/win32/olectlid.d | 1 + 3rdparty/win32/oledlg.d | 1 + 3rdparty/win32/oleidl.d | 1 + 3rdparty/win32/pbt.d | 1 + 3rdparty/win32/powrprof.d | 1 + 3rdparty/win32/prsht.d | 1 + 3rdparty/win32/psapi.d | 1 + 3rdparty/win32/rapi.d | 1 + 3rdparty/win32/ras.d | 2 ++ 3rdparty/win32/rasdlg.d | 1 + 3rdparty/win32/raserror.d | 1 + 3rdparty/win32/rassapi.d | 1 + 3rdparty/win32/reason.d | 1 + 3rdparty/win32/regstr.d | 1 + 3rdparty/win32/richedit.d | 1 + 3rdparty/win32/richole.d | 1 + 3rdparty/win32/rpc.d | 1 + 3rdparty/win32/rpcdce.d | 1 + 3rdparty/win32/rpcdce2.d | 1 + 3rdparty/win32/rpcdcep.d | 1 + 3rdparty/win32/rpcndr.d | 1 + 3rdparty/win32/rpcnsi.d | 1 + 3rdparty/win32/rpcnsip.d | 1 + 3rdparty/win32/rpcnterr.d | 1 + 3rdparty/win32/schannel.d | 1 + 3rdparty/win32/secext.d | 1 + 3rdparty/win32/security.d | 1 + 3rdparty/win32/servprov.d | 1 + 3rdparty/win32/setupapi.d | 1 + 3rdparty/win32/shellapi.d | 1 + 3rdparty/win32/shldisp.d | 1 + 3rdparty/win32/shlguid.d | 1 + 3rdparty/win32/shlobj.d | 1 + 3rdparty/win32/shlwapi.d | 1 + 3rdparty/win32/snmp.d | 1 + 3rdparty/win32/sql.d | 1 + 3rdparty/win32/sqlext.d | 1 + 3rdparty/win32/sqltypes.d | 1 + 3rdparty/win32/sqlucode.d | 1 + 3rdparty/win32/sspi.d | 1 + 3rdparty/win32/subauth.d | 1 + 3rdparty/win32/testall.d | 1 + 3rdparty/win32/tlhelp32.d | 1 + 3rdparty/win32/tmschema.d | 1 + 3rdparty/win32/unknwn.d | 1 + 3rdparty/win32/usp10.d | 1 + 3rdparty/win32/uuid.d | 1 + 3rdparty/win32/vfw.d | 1 + 3rdparty/win32/w32api.d | 1 + 3rdparty/win32/winbase.d | 1 + 3rdparty/win32/winber.d | 1 + 3rdparty/win32/wincon.d | 1 + 3rdparty/win32/wincrypt.d | 1 + 3rdparty/win32/windef.d | 1 + 3rdparty/win32/windows.d | 1 + 3rdparty/win32/winerror.d | 1 + 3rdparty/win32/wingdi.d | 1 + 3rdparty/win32/wininet.d | 1 + 3rdparty/win32/winioctl.d | 1 + 3rdparty/win32/winldap.d | 1 + 3rdparty/win32/winnetwk.d | 1 + 3rdparty/win32/winnls.d | 1 + 3rdparty/win32/winnt.d | 1 + 3rdparty/win32/winperf.d | 1 + 3rdparty/win32/winreg.d | 1 + 3rdparty/win32/winsock.d | 1 + 3rdparty/win32/winsock2.d | 1 + 3rdparty/win32/winspool.d | 1 + 3rdparty/win32/winsvc.d | 1 + 3rdparty/win32/winuser.d | 1 + 3rdparty/win32/winver.d | 1 + 3rdparty/win32/ws2tcpip.d | 1 + 3rdparty/win32/wtsapi32.d | 1 + 3rdparty/win32/wtypes.d | 1 + 182 files changed, 183 insertions(+) diff --git a/3rdparty/win32/accctrl.d b/3rdparty/win32/accctrl.d index 1bc969b4..31ecec3f 100644 --- a/3rdparty/win32/accctrl.d +++ b/3rdparty/win32/accctrl.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.accctrl; +version(Windows): private import win32.basetyps, win32.w32api, win32.winbase, win32.windef; diff --git a/3rdparty/win32/aclapi.d b/3rdparty/win32/aclapi.d index 6d1ce9ab..da7aa371 100644 --- a/3rdparty/win32/aclapi.d +++ b/3rdparty/win32/aclapi.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.aclapi; +version(Windows): pragma(lib, "advapi32"); import win32.windows, win32.accctrl; diff --git a/3rdparty/win32/aclui.d b/3rdparty/win32/aclui.d index a8e36778..ec519b78 100644 --- a/3rdparty/win32/aclui.d +++ b/3rdparty/win32/aclui.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.aclui; +version(Windows): pragma(lib, "aclui"); private import win32.w32api; diff --git a/3rdparty/win32/basetsd.d b/3rdparty/win32/basetsd.d index baa6dc5d..3154766f 100644 --- a/3rdparty/win32/basetsd.d +++ b/3rdparty/win32/basetsd.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.basetsd; +version(Windows): /* This template is used in these modules to declare constant pointer types, * in order to support both D 1.x and 2.x. diff --git a/3rdparty/win32/basetyps.d b/3rdparty/win32/basetyps.d index d6b318f8..5bb37b19 100644 --- a/3rdparty/win32/basetyps.d +++ b/3rdparty/win32/basetyps.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.basetyps; +version(Windows): private import win32.windef, win32.basetsd; diff --git a/3rdparty/win32/cderr.d b/3rdparty/win32/cderr.d index 9ac54206..376a0e0c 100644 --- a/3rdparty/win32/cderr.d +++ b/3rdparty/win32/cderr.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.cderr; +version(Windows): enum { CDERR_DIALOGFAILURE = 0xFFFF, diff --git a/3rdparty/win32/cguid.d b/3rdparty/win32/cguid.d index 1675cc65..069af07a 100644 --- a/3rdparty/win32/cguid.d +++ b/3rdparty/win32/cguid.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.cguid; +version(Windows): private import win32.basetyps; diff --git a/3rdparty/win32/comcat.d b/3rdparty/win32/comcat.d index 89639bdb..725464ec 100644 --- a/3rdparty/win32/comcat.d +++ b/3rdparty/win32/comcat.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.comcat; +version(Windows): import win32.windows, win32.ole2; private import win32.basetyps, win32.cguid, win32.objbase, win32.unknwn, diff --git a/3rdparty/win32/commctrl.d b/3rdparty/win32/commctrl.d index d151fb29..ffdc54a2 100644 --- a/3rdparty/win32/commctrl.d +++ b/3rdparty/win32/commctrl.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.commctrl; +version(Windows): pragma(lib, "comctl32"); private import win32.w32api, win32.windef, win32.winuser; diff --git a/3rdparty/win32/commdlg.d b/3rdparty/win32/commdlg.d index c57db79d..03bb9d91 100644 --- a/3rdparty/win32/commdlg.d +++ b/3rdparty/win32/commdlg.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.commdlg; +version(Windows): pragma(lib, "comdlg32"); private import win32.w32api; diff --git a/3rdparty/win32/core.d b/3rdparty/win32/core.d index b540886e..8cad1a9d 100644 --- a/3rdparty/win32/core.d +++ b/3rdparty/win32/core.d @@ -6,6 +6,7 @@ * Placed into public domain * \***********************************************************************/ module win32.core; +version(Windows): /** The core Windows API functions. diff --git a/3rdparty/win32/cpl.d b/3rdparty/win32/cpl.d index f444e48b..b4b29209 100644 --- a/3rdparty/win32/cpl.d +++ b/3rdparty/win32/cpl.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.cpl; +version(Windows): private import win32.windef, win32.winuser; diff --git a/3rdparty/win32/cplext.d b/3rdparty/win32/cplext.d index 1b6bfcfb..5322c615 100644 --- a/3rdparty/win32/cplext.d +++ b/3rdparty/win32/cplext.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.cplext; +version(Windows): enum : uint { CPLPAGE_MOUSE_BUTTONS = 1, diff --git a/3rdparty/win32/custcntl.d b/3rdparty/win32/custcntl.d index 1bbfed48..1064924f 100644 --- a/3rdparty/win32/custcntl.d +++ b/3rdparty/win32/custcntl.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.custcntl; +version(Windows): private import win32.windef; diff --git a/3rdparty/win32/dbt.d b/3rdparty/win32/dbt.d index 9275d52e..1248dfb7 100644 --- a/3rdparty/win32/dbt.d +++ b/3rdparty/win32/dbt.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.dbt; +version(Windows): import win32.w32api, win32.windef; import win32.basetyps; // for GUID diff --git a/3rdparty/win32/dde.d b/3rdparty/win32/dde.d index 92176432..412fc27d 100644 --- a/3rdparty/win32/dde.d +++ b/3rdparty/win32/dde.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.dde; +version(Windows): pragma(lib, "user32"); private import win32.windef; diff --git a/3rdparty/win32/ddeml.d b/3rdparty/win32/ddeml.d index 1dca9b1b..fc46f078 100644 --- a/3rdparty/win32/ddeml.d +++ b/3rdparty/win32/ddeml.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.ddeml; +version(Windows): pragma(lib, "user32"); private import win32.basetsd, win32.windef, win32.winnt; diff --git a/3rdparty/win32/dhcpcsdk.d b/3rdparty/win32/dhcpcsdk.d index c9d9e118..c1bd6b0c 100644 --- a/3rdparty/win32/dhcpcsdk.d +++ b/3rdparty/win32/dhcpcsdk.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.dhcpcsdk; +version(Windows): private import win32.w32api, win32.windef; diff --git a/3rdparty/win32/directx/d3d10.d b/3rdparty/win32/directx/d3d10.d index 894676f2..33356c91 100644 --- a/3rdparty/win32/directx/d3d10.d +++ b/3rdparty/win32/directx/d3d10.d @@ -6,6 +6,7 @@ * Placed into public domain * \***********************************************************************/ module win32.directx.d3d10; +version(Windows): private import win32.windows; diff --git a/3rdparty/win32/directx/d3d10effect.d b/3rdparty/win32/directx/d3d10effect.d index 96746eb7..f731784d 100644 --- a/3rdparty/win32/directx/d3d10effect.d +++ b/3rdparty/win32/directx/d3d10effect.d @@ -6,6 +6,7 @@ * Placed into public domain * \***********************************************************************/ module win32.directx.d3d10effect; +version(Windows): private import win32.windows; private import win32.directx.d3d10; diff --git a/3rdparty/win32/directx/d3d10misc.d b/3rdparty/win32/directx/d3d10misc.d index acbe02b4..ba74ec13 100644 --- a/3rdparty/win32/directx/d3d10misc.d +++ b/3rdparty/win32/directx/d3d10misc.d @@ -6,6 +6,7 @@ * Placed into public domain * \***********************************************************************/ module win32.directx.d3d10misc; +version(Windows): private import win32.windows; diff --git a/3rdparty/win32/directx/d3d10shader.d b/3rdparty/win32/directx/d3d10shader.d index 1b6aaeea..8d4f62ec 100644 --- a/3rdparty/win32/directx/d3d10shader.d +++ b/3rdparty/win32/directx/d3d10shader.d @@ -6,6 +6,7 @@ * Placed into public domain * \***********************************************************************/ module win32.directx.d3d10shader; +version(Windows): private import win32.windows; private import win32.directx.d3d10; diff --git a/3rdparty/win32/directx/d3d9.d b/3rdparty/win32/directx/d3d9.d index 896462a0..c444745a 100644 --- a/3rdparty/win32/directx/d3d9.d +++ b/3rdparty/win32/directx/d3d9.d @@ -7,6 +7,7 @@ * ****************************************************************************/ module win32.directx.d3d9; +version(Windows): import win32.windows; public import win32.directx.d3d9types; diff --git a/3rdparty/win32/directx/d3d9caps.d b/3rdparty/win32/directx/d3d9caps.d index a0b674dc..7d2f0897 100644 --- a/3rdparty/win32/directx/d3d9caps.d +++ b/3rdparty/win32/directx/d3d9caps.d @@ -8,6 +8,7 @@ ***************************************************************************/ module win32.directx.d3d9caps; +version(Windows): private import win32.windows, win32.directx.d3d9types; diff --git a/3rdparty/win32/directx/d3d9types.d b/3rdparty/win32/directx/d3d9types.d index 77641f6e..4ce84787 100644 --- a/3rdparty/win32/directx/d3d9types.d +++ b/3rdparty/win32/directx/d3d9types.d @@ -8,6 +8,7 @@ ***************************************************************************/ module win32.directx.d3d9types; +version(Windows): private import win32.windows; diff --git a/3rdparty/win32/directx/d3dx10.d b/3rdparty/win32/directx/d3dx10.d index 298644ba..b62bbd4e 100644 --- a/3rdparty/win32/directx/d3dx10.d +++ b/3rdparty/win32/directx/d3dx10.d @@ -6,6 +6,7 @@ * Placed into public domain * \***********************************************************************/ module win32.directx.d3dx10; +version(Windows): private import win32.windows; diff --git a/3rdparty/win32/directx/d3dx10async.d b/3rdparty/win32/directx/d3dx10async.d index 8388a00e..fef2814f 100644 --- a/3rdparty/win32/directx/d3dx10async.d +++ b/3rdparty/win32/directx/d3dx10async.d @@ -6,6 +6,7 @@ * Placed into public domain * \***********************************************************************/ module win32.directx.d3dx10async; +version(Windows): private import win32.windows; private import win32.directx.d3d10; diff --git a/3rdparty/win32/directx/d3dx10core.d b/3rdparty/win32/directx/d3dx10core.d index 01e9e9b9..61e5e7ef 100644 --- a/3rdparty/win32/directx/d3dx10core.d +++ b/3rdparty/win32/directx/d3dx10core.d @@ -6,6 +6,7 @@ * Placed into public domain * \***********************************************************************/ module win32.directx.d3dx10core; +version(Windows): private import win32.windows; diff --git a/3rdparty/win32/directx/d3dx10math.d b/3rdparty/win32/directx/d3dx10math.d index 8c3fe50d..70c528c8 100644 --- a/3rdparty/win32/directx/d3dx10math.d +++ b/3rdparty/win32/directx/d3dx10math.d @@ -6,6 +6,7 @@ * Placed into public domain * \***********************************************************************/ module win32.directx.d3dx10math; +version(Windows): version(Tango) { import tango.math.Math; diff --git a/3rdparty/win32/directx/d3dx10mesh.d b/3rdparty/win32/directx/d3dx10mesh.d index 96f4f748..827886dd 100644 --- a/3rdparty/win32/directx/d3dx10mesh.d +++ b/3rdparty/win32/directx/d3dx10mesh.d @@ -6,6 +6,7 @@ * Placed into public domain * \***********************************************************************/ module win32.directx.d3dx10mesh; +version(Windows): private import win32.windows; private import win32.directx.d3d10; diff --git a/3rdparty/win32/directx/d3dx10tex.d b/3rdparty/win32/directx/d3dx10tex.d index bd39bb48..31d2db57 100644 --- a/3rdparty/win32/directx/d3dx10tex.d +++ b/3rdparty/win32/directx/d3dx10tex.d @@ -6,6 +6,7 @@ * Placed into public domain * \***********************************************************************/ module win32.directx.d3dx10tex; +version(Windows): private import win32.windows; private import win32.directx.d3d10; diff --git a/3rdparty/win32/directx/d3dx9.d b/3rdparty/win32/directx/d3dx9.d index d1580216..d0bc0c9d 100644 --- a/3rdparty/win32/directx/d3dx9.d +++ b/3rdparty/win32/directx/d3dx9.d @@ -1,6 +1,7 @@ // D3DX Types and Constants --------------------------------------------------------------------------------------- module win32.directx.d3dx9; +version(Windows): public import win32.directx.d3d9; public import win32.windows; diff --git a/3rdparty/win32/directx/dinput8.d b/3rdparty/win32/directx/dinput8.d index 2ea08131..e509a571 100644 --- a/3rdparty/win32/directx/dinput8.d +++ b/3rdparty/win32/directx/dinput8.d @@ -1,4 +1,5 @@ module win32.directx.dinput8; +version(Windows): //import tango.sys.win32.Types; //alias char CHAR; diff --git a/3rdparty/win32/directx/dsound8.d b/3rdparty/win32/directx/dsound8.d index 300b3dfa..520e0d7c 100644 --- a/3rdparty/win32/directx/dsound8.d +++ b/3rdparty/win32/directx/dsound8.d @@ -1,4 +1,5 @@ module win32.directx.dsound8; +version(Windows): //import tango.sys.win32.Types; import win32.windows; diff --git a/3rdparty/win32/directx/dxerr.d b/3rdparty/win32/directx/dxerr.d index 58b1c3fb..72d5d452 100644 --- a/3rdparty/win32/directx/dxerr.d +++ b/3rdparty/win32/directx/dxerr.d @@ -6,6 +6,7 @@ * Placed into public domain * \***********************************************************************/ module win32.directx.dxerr; +version(Windows): import win32.windows; diff --git a/3rdparty/win32/directx/dxerr8.d b/3rdparty/win32/directx/dxerr8.d index 98223fcc..103bba80 100644 --- a/3rdparty/win32/directx/dxerr8.d +++ b/3rdparty/win32/directx/dxerr8.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.directx.dxerr8; +version(Windows): /* dxerr8.d - Header file for the DirectX 8 Error API diff --git a/3rdparty/win32/directx/dxerr9.d b/3rdparty/win32/directx/dxerr9.d index 1707321c..b2efdf2e 100644 --- a/3rdparty/win32/directx/dxerr9.d +++ b/3rdparty/win32/directx/dxerr9.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.directx.dxerr9; +version(Windows): /* dxerr9.h - Header file for the DirectX 9 Error API diff --git a/3rdparty/win32/directx/dxgi.d b/3rdparty/win32/directx/dxgi.d index bd71dc9c..4a47628d 100644 --- a/3rdparty/win32/directx/dxgi.d +++ b/3rdparty/win32/directx/dxgi.d @@ -6,6 +6,7 @@ * Placed into public domain * \***********************************************************************/ module win32.directx.dxgi; +version(Windows): private import win32.windows; diff --git a/3rdparty/win32/directx/dxgitype.d b/3rdparty/win32/directx/dxgitype.d index adeda0c6..4da31355 100644 --- a/3rdparty/win32/directx/dxgitype.d +++ b/3rdparty/win32/directx/dxgitype.d @@ -6,6 +6,7 @@ * Placed into public domain * \***********************************************************************/ module win32.directx.dxgitype; +version(Windows): private import win32.windows; diff --git a/3rdparty/win32/dlgs.d b/3rdparty/win32/dlgs.d index efdb1904..f849903c 100644 --- a/3rdparty/win32/dlgs.d +++ b/3rdparty/win32/dlgs.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.dlgs; +version(Windows): private import win32.windef; diff --git a/3rdparty/win32/docobj.d b/3rdparty/win32/docobj.d index 5eda7d9e..726f6d61 100644 --- a/3rdparty/win32/docobj.d +++ b/3rdparty/win32/docobj.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.docobj; +version(Windows): private import win32.basetyps, win32.oaidl, win32.objidl, win32.oleidl, win32.unknwn, win32.windef, win32.wtypes; diff --git a/3rdparty/win32/errorrep.d b/3rdparty/win32/errorrep.d index 0e758391..ae3bb613 100644 --- a/3rdparty/win32/errorrep.d +++ b/3rdparty/win32/errorrep.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.errorrep; +version(Windows): private import win32.w32api, win32.windef; diff --git a/3rdparty/win32/exdisp.d b/3rdparty/win32/exdisp.d index 2db8df88..61d03d38 100644 --- a/3rdparty/win32/exdisp.d +++ b/3rdparty/win32/exdisp.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.exdisp; +version(Windows): import win32.docobj, win32.oaidl, win32.ocidl; private import win32.basetyps, win32.windef, win32.wtypes; diff --git a/3rdparty/win32/exdispid.d b/3rdparty/win32/exdispid.d index 6d3b3296..8225ca09 100644 --- a/3rdparty/win32/exdispid.d +++ b/3rdparty/win32/exdispid.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.exdispid; +version(Windows): enum : int { DISPID_STATUSTEXTCHANGE = 102, diff --git a/3rdparty/win32/httpext.d b/3rdparty/win32/httpext.d index cf03b42a..d82be189 100644 --- a/3rdparty/win32/httpext.d +++ b/3rdparty/win32/httpext.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.httpext; +version(Windows): /* Comment from MinGW httpext.h - Header for ISAPI extensions. diff --git a/3rdparty/win32/idispids.d b/3rdparty/win32/idispids.d index 93064be7..230fe935 100644 --- a/3rdparty/win32/idispids.d +++ b/3rdparty/win32/idispids.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.idispids; +version(Windows): enum : int { DISPID_AMBIENT_OFFLINEIFNOTCONNECTED = -5501, diff --git a/3rdparty/win32/imagehlp.d b/3rdparty/win32/imagehlp.d index 314f98f9..dc48ff24 100644 --- a/3rdparty/win32/imagehlp.d +++ b/3rdparty/win32/imagehlp.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.imagehlp; +version(Windows): /* Comment from MinGW NOTE: This strictly does not belong in the Win32 API since it's diff --git a/3rdparty/win32/imm.d b/3rdparty/win32/imm.d index 3a0002c1..ee53b6c5 100644 --- a/3rdparty/win32/imm.d +++ b/3rdparty/win32/imm.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.imm; +version(Windows): pragma(lib, "imm32"); import win32.windef, win32.wingdi; diff --git a/3rdparty/win32/intshcut.d b/3rdparty/win32/intshcut.d index dfc247c3..498a5d44 100644 --- a/3rdparty/win32/intshcut.d +++ b/3rdparty/win32/intshcut.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.intshcut; +version(Windows): private import win32.unknwn, win32.windef; diff --git a/3rdparty/win32/ipexport.d b/3rdparty/win32/ipexport.d index 754e9185..0115031c 100644 --- a/3rdparty/win32/ipexport.d +++ b/3rdparty/win32/ipexport.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.ipexport; +version(Windows): private import win32.windef; diff --git a/3rdparty/win32/iphlpapi.d b/3rdparty/win32/iphlpapi.d index f722ef2a..35707b06 100644 --- a/3rdparty/win32/iphlpapi.d +++ b/3rdparty/win32/iphlpapi.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.iphlpapi; +version(Windows): import win32.ipexport, win32.iprtrmib, win32.iptypes; private import win32.winbase, win32.windef; diff --git a/3rdparty/win32/ipifcons.d b/3rdparty/win32/ipifcons.d index f7bc7879..107717d7 100644 --- a/3rdparty/win32/ipifcons.d +++ b/3rdparty/win32/ipifcons.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.ipifcons; +version(Windows): // FIXME: check types of constants diff --git a/3rdparty/win32/iprtrmib.d b/3rdparty/win32/iprtrmib.d index 0a3a1967..96926c9e 100644 --- a/3rdparty/win32/iprtrmib.d +++ b/3rdparty/win32/iprtrmib.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.iprtrmib; +version(Windows): import win32.ipifcons; private import win32.windef; diff --git a/3rdparty/win32/iptypes.d b/3rdparty/win32/iptypes.d index b22bd302..cc90cc13 100644 --- a/3rdparty/win32/iptypes.d +++ b/3rdparty/win32/iptypes.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.iptypes; +version(Windows): import win32.windef; version(Tango){ diff --git a/3rdparty/win32/isguids.d b/3rdparty/win32/isguids.d index d9da4bfd..05395ef3 100644 --- a/3rdparty/win32/isguids.d +++ b/3rdparty/win32/isguids.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.isguids; +version(Windows): private import win32.basetyps; diff --git a/3rdparty/win32/lm.d b/3rdparty/win32/lm.d index ebbdbdc3..6b4d1eca 100644 --- a/3rdparty/win32/lm.d +++ b/3rdparty/win32/lm.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lm; +version(Windows): /* removed - now supporting only Win2k up version (WindowsVista) { version = WIN32_WINNT_ONLY; diff --git a/3rdparty/win32/lmaccess.d b/3rdparty/win32/lmaccess.d index dd573db2..b49c5c8d 100644 --- a/3rdparty/win32/lmaccess.d +++ b/3rdparty/win32/lmaccess.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmaccess; +version(Windows): pragma(lib, "netapi32"); /** diff --git a/3rdparty/win32/lmalert.d b/3rdparty/win32/lmalert.d index 4d2bb62a..669afabc 100644 --- a/3rdparty/win32/lmalert.d +++ b/3rdparty/win32/lmalert.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmalert; +version(Windows): pragma(lib, "netapi32"); private import win32.lmcons, win32.windef; diff --git a/3rdparty/win32/lmapibuf.d b/3rdparty/win32/lmapibuf.d index f02c71fd..dedaa146 100644 --- a/3rdparty/win32/lmapibuf.d +++ b/3rdparty/win32/lmapibuf.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmapibuf; +version(Windows): pragma(lib, "netapi32"); private import win32.lmcons, win32.windef; diff --git a/3rdparty/win32/lmat.d b/3rdparty/win32/lmat.d index 760730e1..1d293f02 100644 --- a/3rdparty/win32/lmat.d +++ b/3rdparty/win32/lmat.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmat; +version(Windows): pragma(lib, "netapi32"); private import win32.lmcons, win32.windef; diff --git a/3rdparty/win32/lmaudit.d b/3rdparty/win32/lmaudit.d index 57fdfa99..c011257c 100644 --- a/3rdparty/win32/lmaudit.d +++ b/3rdparty/win32/lmaudit.d @@ -9,6 +9,7 @@ \***********************************************************************/ // COMMENT: This file may be deprecated. module win32.lmaudit; +version(Windows): private import win32.lmcons, win32.windef; diff --git a/3rdparty/win32/lmbrowsr.d b/3rdparty/win32/lmbrowsr.d index d7f320f9..a7dbf903 100644 --- a/3rdparty/win32/lmbrowsr.d +++ b/3rdparty/win32/lmbrowsr.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmbrowsr; +version(Windows): private import win32.lmcons, win32.windef; diff --git a/3rdparty/win32/lmchdev.d b/3rdparty/win32/lmchdev.d index 684d4116..932b11c4 100644 --- a/3rdparty/win32/lmchdev.d +++ b/3rdparty/win32/lmchdev.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmchdev; +version(Windows): // COMMENT: This file might be deprecated. diff --git a/3rdparty/win32/lmconfig.d b/3rdparty/win32/lmconfig.d index 6733fa27..43eb9ce0 100644 --- a/3rdparty/win32/lmconfig.d +++ b/3rdparty/win32/lmconfig.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmconfig; +version(Windows): // All functions in this file are deprecated! diff --git a/3rdparty/win32/lmcons.d b/3rdparty/win32/lmcons.d index 38f98944..ab704817 100644 --- a/3rdparty/win32/lmcons.d +++ b/3rdparty/win32/lmcons.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmcons; +version(Windows): private import win32.windef; private import win32.lmerr; // for NERR_BASE diff --git a/3rdparty/win32/lmerr.d b/3rdparty/win32/lmerr.d index 700220a1..23c29938 100644 --- a/3rdparty/win32/lmerr.d +++ b/3rdparty/win32/lmerr.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmerr; +version(Windows): import win32.winerror; diff --git a/3rdparty/win32/lmerrlog.d b/3rdparty/win32/lmerrlog.d index 406b6ac8..402a786b 100644 --- a/3rdparty/win32/lmerrlog.d +++ b/3rdparty/win32/lmerrlog.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmerrlog; +version(Windows): // COMMENT: This appears to be only for Win16. All functions are deprecated. diff --git a/3rdparty/win32/lmmsg.d b/3rdparty/win32/lmmsg.d index 990f855e..1ff15b13 100644 --- a/3rdparty/win32/lmmsg.d +++ b/3rdparty/win32/lmmsg.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmmsg; +version(Windows): pragma(lib, "netapi32"); private import win32.lmcons, win32.windef, win32.w32api; diff --git a/3rdparty/win32/lmremutl.d b/3rdparty/win32/lmremutl.d index 1a58e978..c32453e1 100644 --- a/3rdparty/win32/lmremutl.d +++ b/3rdparty/win32/lmremutl.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmremutl; +version(Windows): pragma(lib, "netapi32"); // D Conversion Note: DESC_CHAR is defined as TCHAR. diff --git a/3rdparty/win32/lmrepl.d b/3rdparty/win32/lmrepl.d index 36c28251..abe3a1e1 100644 --- a/3rdparty/win32/lmrepl.d +++ b/3rdparty/win32/lmrepl.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmrepl; +version(Windows): pragma(lib, "netapi32"); private import win32.lmcons, win32.windef; diff --git a/3rdparty/win32/lmserver.d b/3rdparty/win32/lmserver.d index e3b176c8..ead6671a 100644 --- a/3rdparty/win32/lmserver.d +++ b/3rdparty/win32/lmserver.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmserver; +version(Windows): import win32.winsvc; private import win32.lmcons, win32.windef; diff --git a/3rdparty/win32/lmshare.d b/3rdparty/win32/lmshare.d index d70c65cf..84b423b0 100644 --- a/3rdparty/win32/lmshare.d +++ b/3rdparty/win32/lmshare.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmshare; +version(Windows): pragma(lib, "netapi"); import win32.lmcons; diff --git a/3rdparty/win32/lmsname.d b/3rdparty/win32/lmsname.d index 9081ff2c..12a7ddea 100644 --- a/3rdparty/win32/lmsname.d +++ b/3rdparty/win32/lmsname.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmsname; +version(Windows): private import win32.windef; diff --git a/3rdparty/win32/lmstats.d b/3rdparty/win32/lmstats.d index a2b0d1b3..4aeb8dad 100644 --- a/3rdparty/win32/lmstats.d +++ b/3rdparty/win32/lmstats.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmstats; +version(Windows): pragma(lib, "netapi32"); private import win32.lmcons, win32.windef; diff --git a/3rdparty/win32/lmsvc.d b/3rdparty/win32/lmsvc.d index f282924e..ab6544c6 100644 --- a/3rdparty/win32/lmsvc.d +++ b/3rdparty/win32/lmsvc.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmsvc; +version(Windows): // FIXME: Is this file deprecated? All of the functions are only for Win16. /** diff --git a/3rdparty/win32/lmuse.d b/3rdparty/win32/lmuse.d index 4974e9b4..bfd6bc4c 100644 --- a/3rdparty/win32/lmuse.d +++ b/3rdparty/win32/lmuse.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmuse; +version(Windows): pragma(lib, "netapi32"); import win32.lmuseflg; diff --git a/3rdparty/win32/lmuseflg.d b/3rdparty/win32/lmuseflg.d index 746dad98..f6ebbe0a 100644 --- a/3rdparty/win32/lmuseflg.d +++ b/3rdparty/win32/lmuseflg.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmuseflg; +version(Windows): enum : uint { USE_NOFORCE = 0, diff --git a/3rdparty/win32/lmwksta.d b/3rdparty/win32/lmwksta.d index 6fb5a269..e42ed0ce 100644 --- a/3rdparty/win32/lmwksta.d +++ b/3rdparty/win32/lmwksta.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lmwksta; +version(Windows): pragma(lib, "netapi32"); import win32.lmuseflg; diff --git a/3rdparty/win32/lzexpand.d b/3rdparty/win32/lzexpand.d index 0050e8c1..7201fd62 100644 --- a/3rdparty/win32/lzexpand.d +++ b/3rdparty/win32/lzexpand.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.lzexpand; +version(Windows): pragma(lib, "lz32"); private import win32.winbase, win32.windef; diff --git a/3rdparty/win32/mapi.d b/3rdparty/win32/mapi.d index 0bafe254..84e83d2c 100644 --- a/3rdparty/win32/mapi.d +++ b/3rdparty/win32/mapi.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.mapi; +version(Windows): private import win32.windef; diff --git a/3rdparty/win32/mciavi.d b/3rdparty/win32/mciavi.d index 6259e35c..5b5493bb 100644 --- a/3rdparty/win32/mciavi.d +++ b/3rdparty/win32/mciavi.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.mciavi; +version(Windows): private import win32.mmsystem; diff --git a/3rdparty/win32/mcx.d b/3rdparty/win32/mcx.d index 8b5c603e..928f3947 100644 --- a/3rdparty/win32/mcx.d +++ b/3rdparty/win32/mcx.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.mcx; +version(Windows): private import win32.windef; diff --git a/3rdparty/win32/mgmtapi.d b/3rdparty/win32/mgmtapi.d index 6867c068..f16894b9 100644 --- a/3rdparty/win32/mgmtapi.d +++ b/3rdparty/win32/mgmtapi.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.mgmtapi; +version(Windows): import win32.snmp; private import win32.windef; diff --git a/3rdparty/win32/mmsystem.d b/3rdparty/win32/mmsystem.d index 1c39e246..0535b382 100644 --- a/3rdparty/win32/mmsystem.d +++ b/3rdparty/win32/mmsystem.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.mmsystem; +version(Windows): pragma(lib, "winmm"); /* The #defines MAKEFOURCC, mmioFOURCC, sndAlias are used to define diff --git a/3rdparty/win32/msacm.d b/3rdparty/win32/msacm.d index 7e0facc5..ec51acb4 100644 --- a/3rdparty/win32/msacm.d +++ b/3rdparty/win32/msacm.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.msacm; +version(Windows): private import win32.basetsd, win32.mmsystem, win32.windef; diff --git a/3rdparty/win32/mshtml.d b/3rdparty/win32/mshtml.d index d3120367..a0b91264 100644 --- a/3rdparty/win32/mshtml.d +++ b/3rdparty/win32/mshtml.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.mshtml; +version(Windows): private import win32.basetyps, win32.oaidl, win32.unknwn, win32.windef, win32.wtypes; diff --git a/3rdparty/win32/mswsock.d b/3rdparty/win32/mswsock.d index cadb395a..7807b489 100644 --- a/3rdparty/win32/mswsock.d +++ b/3rdparty/win32/mswsock.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.mswsock; +version(Windows): import win32.winbase, win32.windef; private import win32.basetyps, win32.w32api; diff --git a/3rdparty/win32/nb30.d b/3rdparty/win32/nb30.d index e59798b6..8f135166 100644 --- a/3rdparty/win32/nb30.d +++ b/3rdparty/win32/nb30.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.nb30; +version(Windows): private import win32.windef; diff --git a/3rdparty/win32/nddeapi.d b/3rdparty/win32/nddeapi.d index 853325e9..3033bf74 100644 --- a/3rdparty/win32/nddeapi.d +++ b/3rdparty/win32/nddeapi.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.nddeapi; +version(Windows): private import win32.windef; diff --git a/3rdparty/win32/nspapi.d b/3rdparty/win32/nspapi.d index ed588520..e101cd3a 100644 --- a/3rdparty/win32/nspapi.d +++ b/3rdparty/win32/nspapi.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.nspapi; +version(Windows): private import win32.basetyps, win32.windef; diff --git a/3rdparty/win32/ntdef.d b/3rdparty/win32/ntdef.d index ca9a5a7f..8eaa1d92 100644 --- a/3rdparty/win32/ntdef.d +++ b/3rdparty/win32/ntdef.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.ntdef; +version(Windows): private import win32.basetsd, win32.subauth, win32.windef, win32.winnt; diff --git a/3rdparty/win32/ntdll.d b/3rdparty/win32/ntdll.d index 6accbe02..0d21bcfa 100644 --- a/3rdparty/win32/ntdll.d +++ b/3rdparty/win32/ntdll.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.ntdll; +version(Windows): private import win32.w32api; diff --git a/3rdparty/win32/ntldap.d b/3rdparty/win32/ntldap.d index 637e1bb7..735405f7 100644 --- a/3rdparty/win32/ntldap.d +++ b/3rdparty/win32/ntldap.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.ntldap; +version(Windows): /* TOTHINKABOUT: These constants don't have ANSI/Unicode versioned * aliases. Should we merge them anyway? diff --git a/3rdparty/win32/ntsecapi.d b/3rdparty/win32/ntsecapi.d index f0930d59..d9b43dd1 100644 --- a/3rdparty/win32/ntsecapi.d +++ b/3rdparty/win32/ntsecapi.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.ntsecapi; +version(Windows): private import win32.basetyps, win32.ntdef, win32.windef, win32.winnt, win32.w32api; diff --git a/3rdparty/win32/ntsecpkg.d b/3rdparty/win32/ntsecpkg.d index b2b52b4c..334e62b8 100644 --- a/3rdparty/win32/ntsecpkg.d +++ b/3rdparty/win32/ntsecpkg.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.ntsecpkg; +version(Windows): import win32.windef, win32.ntsecapi, win32.security, win32.ntdef, win32.sspi; import win32.winnt: GUID; diff --git a/3rdparty/win32/oaidl.d b/3rdparty/win32/oaidl.d index bac25f69..8bb869a6 100644 --- a/3rdparty/win32/oaidl.d +++ b/3rdparty/win32/oaidl.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.oaidl; +version(Windows): private import win32.basetyps, win32.unknwn, win32.windef, win32.wtypes; diff --git a/3rdparty/win32/objbase.d b/3rdparty/win32/objbase.d index 6f01b3f8..e60cd8d4 100644 --- a/3rdparty/win32/objbase.d +++ b/3rdparty/win32/objbase.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.objbase; +version(Windows): pragma(lib, "ole32"); import win32.cguid, win32.objidl, win32.unknwn, win32.wtypes; diff --git a/3rdparty/win32/objfwd.d b/3rdparty/win32/objfwd.d index 9903afdf..16fbe1bf 100644 --- a/3rdparty/win32/objfwd.d +++ b/3rdparty/win32/objfwd.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.objfwd; +version(Windows): private import win32.objidl; diff --git a/3rdparty/win32/objidl.d b/3rdparty/win32/objidl.d index a80cc226..eaf6e8f8 100644 --- a/3rdparty/win32/objidl.d +++ b/3rdparty/win32/objidl.d @@ -12,6 +12,7 @@ // rather than in objfwd ? // # do we need the proxies that are defined in this file? module win32.objidl; +version(Windows): import win32.unknwn; import win32.objfwd; diff --git a/3rdparty/win32/objsafe.d b/3rdparty/win32/objsafe.d index 131d85f1..95986e4a 100644 --- a/3rdparty/win32/objsafe.d +++ b/3rdparty/win32/objsafe.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.objsafe; +version(Windows): private import win32.basetyps, win32.unknwn, win32.windef; diff --git a/3rdparty/win32/ocidl.d b/3rdparty/win32/ocidl.d index ba5b8124..d50cafa1 100644 --- a/3rdparty/win32/ocidl.d +++ b/3rdparty/win32/ocidl.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.ocidl; +version(Windows): private import win32.ole2, win32.oleidl, win32.oaidl, win32.objfwd, win32.windef, win32.wtypes; diff --git a/3rdparty/win32/odbcinst.d b/3rdparty/win32/odbcinst.d index 35a19f49..c6d3ccc6 100644 --- a/3rdparty/win32/odbcinst.d +++ b/3rdparty/win32/odbcinst.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.odbcinst; +version(Windows): import win32.sql; private import win32.windef; diff --git a/3rdparty/win32/ole.d b/3rdparty/win32/ole.d index d4ec788e..9db0abdc 100644 --- a/3rdparty/win32/ole.d +++ b/3rdparty/win32/ole.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.ole; +version(Windows): private import win32.windef, win32.wingdi, win32.uuid; diff --git a/3rdparty/win32/ole2.d b/3rdparty/win32/ole2.d index 14197ef7..080c8bc8 100644 --- a/3rdparty/win32/ole2.d +++ b/3rdparty/win32/ole2.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.ole2; +version(Windows): pragma(lib, "ole32"); public import win32.basetyps, win32.objbase, win32.oleauto, win32.olectlid, diff --git a/3rdparty/win32/ole2ver.d b/3rdparty/win32/ole2ver.d index 3d29a1d6..803b7d52 100644 --- a/3rdparty/win32/ole2ver.d +++ b/3rdparty/win32/ole2ver.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.ole2ver; +version(Windows): // These are apparently not documented on the MSDN site const rmm = 23; diff --git a/3rdparty/win32/oleacc.d b/3rdparty/win32/oleacc.d index e8262ecc..ee04b8a0 100644 --- a/3rdparty/win32/oleacc.d +++ b/3rdparty/win32/oleacc.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.oleacc; +version(Windows): pragma(lib, "oleacc"); private import win32.basetyps, win32.oaidl, win32.unknwn, win32.wtypes, diff --git a/3rdparty/win32/oleauto.d b/3rdparty/win32/oleauto.d index df81f1e0..0b02b650 100644 --- a/3rdparty/win32/oleauto.d +++ b/3rdparty/win32/oleauto.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.oleauto; +version(Windows): pragma(lib, "oleaut32"); import win32.oaidl; diff --git a/3rdparty/win32/olectl.d b/3rdparty/win32/olectl.d index 77d9006b..10836828 100644 --- a/3rdparty/win32/olectl.d +++ b/3rdparty/win32/olectl.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.olectl; +version(Windows): // In conversion from MinGW, the following was deleted: //#define FONTSIZE(n) {n##0000, 0} diff --git a/3rdparty/win32/olectlid.d b/3rdparty/win32/olectlid.d index 5e180ccd..f920df86 100644 --- a/3rdparty/win32/olectlid.d +++ b/3rdparty/win32/olectlid.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.olectlid; +version(Windows): private import win32.basetyps; diff --git a/3rdparty/win32/oledlg.d b/3rdparty/win32/oledlg.d index 92e3a877..f604d347 100644 --- a/3rdparty/win32/oledlg.d +++ b/3rdparty/win32/oledlg.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.oledlg; +version(Windows): import win32.commdlg, win32.dlgs, win32.ole2, win32.prsht, win32.shellapi, win32.windows; diff --git a/3rdparty/win32/oleidl.d b/3rdparty/win32/oleidl.d index c9c5d992..58660857 100644 --- a/3rdparty/win32/oleidl.d +++ b/3rdparty/win32/oleidl.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.oleidl; +version(Windows): // DAC: This is defined in ocidl !! // what is it doing in here? diff --git a/3rdparty/win32/pbt.d b/3rdparty/win32/pbt.d index 1668d08c..fb3a095d 100644 --- a/3rdparty/win32/pbt.d +++ b/3rdparty/win32/pbt.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.pbt; +version(Windows): private import win32.windef; diff --git a/3rdparty/win32/powrprof.d b/3rdparty/win32/powrprof.d index 164bf932..c74120d6 100644 --- a/3rdparty/win32/powrprof.d +++ b/3rdparty/win32/powrprof.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.powrprof; +version(Windows): pragma(lib, "powrprof"); private import win32.windef; diff --git a/3rdparty/win32/prsht.d b/3rdparty/win32/prsht.d index bd5ee1a9..92a75bfd 100644 --- a/3rdparty/win32/prsht.d +++ b/3rdparty/win32/prsht.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.prsht; +version(Windows): pragma(lib, "comctl32"); private import win32.w32api, win32.windef, win32.winuser; diff --git a/3rdparty/win32/psapi.d b/3rdparty/win32/psapi.d index d4feccd7..2d90459d 100644 --- a/3rdparty/win32/psapi.d +++ b/3rdparty/win32/psapi.d @@ -13,6 +13,7 @@ */ module win32.psapi; +version(Windows): private import win32.w32api; private import win32.winbase; diff --git a/3rdparty/win32/rapi.d b/3rdparty/win32/rapi.d index 3b790c31..79bba11c 100644 --- a/3rdparty/win32/rapi.d +++ b/3rdparty/win32/rapi.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.rapi; +version(Windows): /* Comment from MinGW NOTE: This strictly does not belong in the Win32 API since it's diff --git a/3rdparty/win32/ras.d b/3rdparty/win32/ras.d index 9a6582eb..28bd4fd5 100644 --- a/3rdparty/win32/ras.d +++ b/3rdparty/win32/ras.d @@ -8,6 +8,8 @@ * Placed into public domain * \***********************************************************************/ module win32.ras; +version(Windows): + pragma(lib, "rasapi32"); private import win32.basetyps, win32.lmcons, win32.w32api, win32.windef; diff --git a/3rdparty/win32/rasdlg.d b/3rdparty/win32/rasdlg.d index 84015605..96dea50b 100644 --- a/3rdparty/win32/rasdlg.d +++ b/3rdparty/win32/rasdlg.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.rasdlg; +version(Windows): import win32.ras; private import win32.lmcons, win32.windef; diff --git a/3rdparty/win32/raserror.d b/3rdparty/win32/raserror.d index fe1c5421..28cce16e 100644 --- a/3rdparty/win32/raserror.d +++ b/3rdparty/win32/raserror.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.raserror; +version(Windows): enum { SUCCESS = 0, diff --git a/3rdparty/win32/rassapi.d b/3rdparty/win32/rassapi.d index e6adf714..61955bc6 100644 --- a/3rdparty/win32/rassapi.d +++ b/3rdparty/win32/rassapi.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.rassapi; +version(Windows): private import win32.lmcons, win32.windef; diff --git a/3rdparty/win32/reason.d b/3rdparty/win32/reason.d index c94f51b0..a5ced3d1 100644 --- a/3rdparty/win32/reason.d +++ b/3rdparty/win32/reason.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.reason; +version(Windows): private import win32.w32api, win32.windef; diff --git a/3rdparty/win32/regstr.d b/3rdparty/win32/regstr.d index 242b645a..a944f0fe 100644 --- a/3rdparty/win32/regstr.d +++ b/3rdparty/win32/regstr.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.regstr; +version(Windows): // TODO: fix possible conflict with shloj. Sort out NEC_98 issue. diff --git a/3rdparty/win32/richedit.d b/3rdparty/win32/richedit.d index 34dd716b..739742d5 100644 --- a/3rdparty/win32/richedit.d +++ b/3rdparty/win32/richedit.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.richedit; +version(Windows): private import win32.windef, win32.winuser; private import win32.wingdi; // for LF_FACESIZE diff --git a/3rdparty/win32/richole.d b/3rdparty/win32/richole.d index a497802f..6ac3f81b 100644 --- a/3rdparty/win32/richole.d +++ b/3rdparty/win32/richole.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.richole; +version(Windows): private import win32.objfwd, win32.objidl, win32.ole2, win32.unknwn, win32.windef; diff --git a/3rdparty/win32/rpc.d b/3rdparty/win32/rpc.d index 3ae55242..d85ae2e9 100644 --- a/3rdparty/win32/rpc.d +++ b/3rdparty/win32/rpc.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.rpc; +version(Windows): /* Moved to rpcdecp (duplicate definition). typedef void *I_RPC_HANDLE; diff --git a/3rdparty/win32/rpcdce.d b/3rdparty/win32/rpcdce.d index 4dad3a63..afe812a7 100644 --- a/3rdparty/win32/rpcdce.d +++ b/3rdparty/win32/rpcdce.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.rpcdce; +version(Windows): pragma(lib, "Rpcrt4"); // TODO: I think MinGW got this wrong. RPC_UNICODE_SUPPORTED should be diff --git a/3rdparty/win32/rpcdce2.d b/3rdparty/win32/rpcdce2.d index c53fbfa6..465e5a68 100644 --- a/3rdparty/win32/rpcdce2.d +++ b/3rdparty/win32/rpcdce2.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.rpcdce2; +version(Windows): import win32.rpcdce; private import win32.basetyps; diff --git a/3rdparty/win32/rpcdcep.d b/3rdparty/win32/rpcdcep.d index 7617175f..a7098e94 100644 --- a/3rdparty/win32/rpcdcep.d +++ b/3rdparty/win32/rpcdcep.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.rpcdcep; +version(Windows): private import win32.basetyps; private import win32.w32api; diff --git a/3rdparty/win32/rpcndr.d b/3rdparty/win32/rpcndr.d index 3249ccc9..c7f96431 100644 --- a/3rdparty/win32/rpcndr.d +++ b/3rdparty/win32/rpcndr.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.rpcndr; +version(Windows): pragma(lib, "rpcrt4"); /* Translation notes: diff --git a/3rdparty/win32/rpcnsi.d b/3rdparty/win32/rpcnsi.d index f6412f28..62fb80c4 100644 --- a/3rdparty/win32/rpcnsi.d +++ b/3rdparty/win32/rpcnsi.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.rpcnsi; +version(Windows): pragma(lib, "rpcns4"); private import win32.basetyps, win32.rpcdcep, win32.rpcnsi, win32.rpcdce, diff --git a/3rdparty/win32/rpcnsip.d b/3rdparty/win32/rpcnsip.d index c018bb0b..d86c8d75 100644 --- a/3rdparty/win32/rpcnsip.d +++ b/3rdparty/win32/rpcnsip.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.rpcnsip; +version(Windows): private import win32.rpcdce, win32.rpcdcep, win32.rpcnsi; diff --git a/3rdparty/win32/rpcnterr.d b/3rdparty/win32/rpcnterr.d index 3bb346f2..9b9e157f 100644 --- a/3rdparty/win32/rpcnterr.d +++ b/3rdparty/win32/rpcnterr.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.rpcnterr; +version(Windows): import win32.winerror; diff --git a/3rdparty/win32/schannel.d b/3rdparty/win32/schannel.d index b41a77f3..7789d26a 100644 --- a/3rdparty/win32/schannel.d +++ b/3rdparty/win32/schannel.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.schannel; +version(Windows): import win32.wincrypt; private import win32.windef; diff --git a/3rdparty/win32/secext.d b/3rdparty/win32/secext.d index f5ec71f3..1c7d4e4e 100644 --- a/3rdparty/win32/secext.d +++ b/3rdparty/win32/secext.d @@ -9,6 +9,7 @@ \***********************************************************************/ // Don't include this file directly, use win32.security instead. module win32.secext; +version(Windows): pragma(lib, "secur32"); private import win32.w32api, win32.windef; diff --git a/3rdparty/win32/security.d b/3rdparty/win32/security.d index 1aea9bd9..09c3b83d 100644 --- a/3rdparty/win32/security.d +++ b/3rdparty/win32/security.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.security; +version(Windows): enum :SECURITY_STATUS{ SEC_E_OK = 0, diff --git a/3rdparty/win32/servprov.d b/3rdparty/win32/servprov.d index fa8b9e93..86d6bec7 100644 --- a/3rdparty/win32/servprov.d +++ b/3rdparty/win32/servprov.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.servprov; +version(Windows): private import win32.basetyps, win32.unknwn, win32.windef, win32.wtypes; diff --git a/3rdparty/win32/setupapi.d b/3rdparty/win32/setupapi.d index c768bef7..45551b3c 100644 --- a/3rdparty/win32/setupapi.d +++ b/3rdparty/win32/setupapi.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.setupapi; +version(Windows): pragma(lib, "setupapi"); private import win32.basetyps, win32.commctrl, win32.prsht, win32.w32api, diff --git a/3rdparty/win32/shellapi.d b/3rdparty/win32/shellapi.d index 65a4eefd..25350bdd 100644 --- a/3rdparty/win32/shellapi.d +++ b/3rdparty/win32/shellapi.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.shellapi; +version(Windows): pragma(lib, "shell32"); private import win32.w32api, win32.windef, win32.basetyps; diff --git a/3rdparty/win32/shldisp.d b/3rdparty/win32/shldisp.d index ffef2b3a..eab92c0b 100644 --- a/3rdparty/win32/shldisp.d +++ b/3rdparty/win32/shldisp.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.shldisp; +version(Windows): private import win32.unknwn, win32.windef, win32.wtypes; diff --git a/3rdparty/win32/shlguid.d b/3rdparty/win32/shlguid.d index 45bab708..06340d79 100644 --- a/3rdparty/win32/shlguid.d +++ b/3rdparty/win32/shlguid.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.shlguid; +version(Windows): private import win32.basetyps, win32.w32api; diff --git a/3rdparty/win32/shlobj.d b/3rdparty/win32/shlobj.d index 36ba5759..7ac879b7 100644 --- a/3rdparty/win32/shlobj.d +++ b/3rdparty/win32/shlobj.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.shlobj; +version(Windows): pragma(lib, "shell32"); // TODO: fix bitfields diff --git a/3rdparty/win32/shlwapi.d b/3rdparty/win32/shlwapi.d index a72c7971..62b47678 100644 --- a/3rdparty/win32/shlwapi.d +++ b/3rdparty/win32/shlwapi.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.shlwapi; +version(Windows): pragma(lib, "shlwapi"); /* Changes compared to MinGW: diff --git a/3rdparty/win32/snmp.d b/3rdparty/win32/snmp.d index 9fb15bd1..f01d030f 100644 --- a/3rdparty/win32/snmp.d +++ b/3rdparty/win32/snmp.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.snmp; +version(Windows): private import win32.windows; diff --git a/3rdparty/win32/sql.d b/3rdparty/win32/sql.d index acc3499c..8913e583 100644 --- a/3rdparty/win32/sql.d +++ b/3rdparty/win32/sql.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.sql; +version(Windows): public import win32.sqltypes; private import win32.windef; diff --git a/3rdparty/win32/sqlext.d b/3rdparty/win32/sqlext.d index 2f19bc29..50a72a14 100644 --- a/3rdparty/win32/sqlext.d +++ b/3rdparty/win32/sqlext.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.sqlext; +version(Windows): /* Conversion notes: The MinGW file was a horrible mess. All of the #defines were sorted alphabetically, diff --git a/3rdparty/win32/sqltypes.d b/3rdparty/win32/sqltypes.d index 3538e36b..e33d193e 100644 --- a/3rdparty/win32/sqltypes.d +++ b/3rdparty/win32/sqltypes.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.sqltypes; +version(Windows): /* Conversion notes: It's assumed that ODBC >= 0x0300. diff --git a/3rdparty/win32/sqlucode.d b/3rdparty/win32/sqlucode.d index 74dba183..07858240 100644 --- a/3rdparty/win32/sqlucode.d +++ b/3rdparty/win32/sqlucode.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.sqlucode; +version(Windows): private import win32.sqlext; diff --git a/3rdparty/win32/sspi.d b/3rdparty/win32/sspi.d index 0859c13a..3289cd9d 100644 --- a/3rdparty/win32/sspi.d +++ b/3rdparty/win32/sspi.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.sspi; +version(Windows): import win32.windef; import win32.ntdef; diff --git a/3rdparty/win32/subauth.d b/3rdparty/win32/subauth.d index d54a3300..53a74430 100644 --- a/3rdparty/win32/subauth.d +++ b/3rdparty/win32/subauth.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.subauth; +version(Windows): private import win32.ntdef, win32.windef; diff --git a/3rdparty/win32/testall.d b/3rdparty/win32/testall.d index c4281f8a..1f900484 100644 --- a/3rdparty/win32/testall.d +++ b/3rdparty/win32/testall.d @@ -1,5 +1,6 @@ // Used only for testing -- imports all windows headers. module win32.testall; +version(Windows): import win32.core; import win32.windows; diff --git a/3rdparty/win32/tlhelp32.d b/3rdparty/win32/tlhelp32.d index d60582d0..3e5a75cd 100644 --- a/3rdparty/win32/tlhelp32.d +++ b/3rdparty/win32/tlhelp32.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.tlhelp32; +version(Windows): private import win32.windef; diff --git a/3rdparty/win32/tmschema.d b/3rdparty/win32/tmschema.d index c61d3716..605c6344 100644 --- a/3rdparty/win32/tmschema.d +++ b/3rdparty/win32/tmschema.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.tmschema; +version(Windows): /* BUTTON parts */ enum { diff --git a/3rdparty/win32/unknwn.d b/3rdparty/win32/unknwn.d index de6278b3..f2b2a5ea 100644 --- a/3rdparty/win32/unknwn.d +++ b/3rdparty/win32/unknwn.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.unknwn; +version(Windows): import win32.objfwd, win32.windef, win32.wtypes; private import win32.basetyps; diff --git a/3rdparty/win32/usp10.d b/3rdparty/win32/usp10.d index 2fd9cbf4..58e57993 100644 --- a/3rdparty/win32/usp10.d +++ b/3rdparty/win32/usp10.d @@ -3,6 +3,7 @@ module win32.usp10; +version(Windows): import win32.windows; diff --git a/3rdparty/win32/uuid.d b/3rdparty/win32/uuid.d index 670550d9..174d8d15 100644 --- a/3rdparty/win32/uuid.d +++ b/3rdparty/win32/uuid.d @@ -1,4 +1,5 @@ module win32.uuid; +version(Windows): import win32.basetyps; diff --git a/3rdparty/win32/vfw.d b/3rdparty/win32/vfw.d index 693b35d2..9ead25cf 100644 --- a/3rdparty/win32/vfw.d +++ b/3rdparty/win32/vfw.d @@ -8,6 +8,7 @@ \***********************************************************************/ module win32.vfw; +version(Windows): pragma(lib, "vfw32"); private import diff --git a/3rdparty/win32/w32api.d b/3rdparty/win32/w32api.d index 914b568e..c6ba5a0d 100644 --- a/3rdparty/win32/w32api.d +++ b/3rdparty/win32/w32api.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.w32api; +version(Windows): enum __W32API_VERSION = 3.17; enum __W32API_MAJOR_VERSION = 3; diff --git a/3rdparty/win32/winbase.d b/3rdparty/win32/winbase.d index 782aa497..567dbaff 100644 --- a/3rdparty/win32/winbase.d +++ b/3rdparty/win32/winbase.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.winbase; +version(Windows): pragma(lib, "kernel32"); /** diff --git a/3rdparty/win32/winber.d b/3rdparty/win32/winber.d index 3e0e426d..4faffea8 100644 --- a/3rdparty/win32/winber.d +++ b/3rdparty/win32/winber.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.winber; +version(Windows): /* Comment from MinGW winber.h - Header file for the Windows LDAP Basic Encoding Rules API diff --git a/3rdparty/win32/wincon.d b/3rdparty/win32/wincon.d index f2fdbc5a..5d4c834f 100644 --- a/3rdparty/win32/wincon.d +++ b/3rdparty/win32/wincon.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.wincon; +version(Windows): pragma(lib, "kernel32"); private import win32.w32api, win32.windef; diff --git a/3rdparty/win32/wincrypt.d b/3rdparty/win32/wincrypt.d index 6a2472bd..c2d47ed0 100644 --- a/3rdparty/win32/wincrypt.d +++ b/3rdparty/win32/wincrypt.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.wincrypt; +version(Windows): private import win32.w32api, win32.winbase, win32.windef; diff --git a/3rdparty/win32/windef.d b/3rdparty/win32/windef.d index 78930d22..ca5cfc7e 100644 --- a/3rdparty/win32/windef.d +++ b/3rdparty/win32/windef.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.windef; +version(Windows): public import win32.winnt; private import win32.w32api; diff --git a/3rdparty/win32/windows.d b/3rdparty/win32/windows.d index 46508ea0..625384ad 100644 --- a/3rdparty/win32/windows.d +++ b/3rdparty/win32/windows.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.windows; +version(Windows): /* windows.h - main header file for the Win32 API diff --git a/3rdparty/win32/winerror.d b/3rdparty/win32/winerror.d index ce2cc01e..8ca05d3d 100644 --- a/3rdparty/win32/winerror.d +++ b/3rdparty/win32/winerror.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.winerror; +version(Windows): /* Comments from the Mingw header: * WAIT_TIMEOUT is also defined in winbase.h diff --git a/3rdparty/win32/wingdi.d b/3rdparty/win32/wingdi.d index cd7194c4..7e62fa97 100644 --- a/3rdparty/win32/wingdi.d +++ b/3rdparty/win32/wingdi.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.wingdi; +version(Windows): pragma(lib, "gdi32"); // FIXME: clean up Windows version support diff --git a/3rdparty/win32/wininet.d b/3rdparty/win32/wininet.d index 9cbfd176..1c36dad4 100644 --- a/3rdparty/win32/wininet.d +++ b/3rdparty/win32/wininet.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.wininet; +version(Windows): pragma(lib, "wininet"); // FIXME: check types and grouping of constants diff --git a/3rdparty/win32/winioctl.d b/3rdparty/win32/winioctl.d index 8c28b772..c41f3765 100644 --- a/3rdparty/win32/winioctl.d +++ b/3rdparty/win32/winioctl.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.winioctl; +version(Windows): // FIXME: check types of some constants diff --git a/3rdparty/win32/winldap.d b/3rdparty/win32/winldap.d index ed10f1a9..534ce8c0 100644 --- a/3rdparty/win32/winldap.d +++ b/3rdparty/win32/winldap.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.winldap; +version(Windows): /* Comment from MinGW winldap.h - Header file for the Windows LDAP API diff --git a/3rdparty/win32/winnetwk.d b/3rdparty/win32/winnetwk.d index faf49a36..d3809b61 100644 --- a/3rdparty/win32/winnetwk.d +++ b/3rdparty/win32/winnetwk.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.winnetwk; +version(Windows): pragma(lib, "mpr"); private import win32.winbase, win32.winerror, win32.winnt; diff --git a/3rdparty/win32/winnls.d b/3rdparty/win32/winnls.d index abf357c8..610e4d19 100644 --- a/3rdparty/win32/winnls.d +++ b/3rdparty/win32/winnls.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.winnls; +version(Windows): pragma(lib, "kernel32"); private import win32.basetsd, win32.w32api, win32.winbase, win32.windef; diff --git a/3rdparty/win32/winnt.d b/3rdparty/win32/winnt.d index 75bd3138..3c49b1c1 100644 --- a/3rdparty/win32/winnt.d +++ b/3rdparty/win32/winnt.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.winnt; +version(Windows): public import win32.basetsd, win32.windef, win32.winerror; private import win32.w32api; diff --git a/3rdparty/win32/winperf.d b/3rdparty/win32/winperf.d index 7af8a3fd..2a375434 100644 --- a/3rdparty/win32/winperf.d +++ b/3rdparty/win32/winperf.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.winperf; +version(Windows): import win32.windef; import win32.winbase; // for SYSTEMTIME diff --git a/3rdparty/win32/winreg.d b/3rdparty/win32/winreg.d index 1924428f..cbc45672 100644 --- a/3rdparty/win32/winreg.d +++ b/3rdparty/win32/winreg.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.winreg; +version(Windows): pragma(lib, "advapi32"); private import win32.w32api, win32.winbase, win32.windef; diff --git a/3rdparty/win32/winsock.d b/3rdparty/win32/winsock.d index 030ddbcf..1346eceb 100644 --- a/3rdparty/win32/winsock.d +++ b/3rdparty/win32/winsock.d @@ -7,6 +7,7 @@ * by Stewart Gordon * \***********************************************************************/ module win32.winsock; +version(Windows): /* Definitions for winsock 1.1 diff --git a/3rdparty/win32/winsock2.d b/3rdparty/win32/winsock2.d index 76bf9400..a83c1414 100644 --- a/3rdparty/win32/winsock2.d +++ b/3rdparty/win32/winsock2.d @@ -7,6 +7,7 @@ * by Daniel Keep * \***********************************************************************/ module win32.winsock2; +version(Windows): pragma(lib, "Ws2_32"); /* diff --git a/3rdparty/win32/winspool.d b/3rdparty/win32/winspool.d index 4df34c2e..876dd2a0 100644 --- a/3rdparty/win32/winspool.d +++ b/3rdparty/win32/winspool.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.winspool; +version(Windows): pragma(lib, "winspool"); private import win32.w32api, win32.windef, win32.wingdi; diff --git a/3rdparty/win32/winsvc.d b/3rdparty/win32/winsvc.d index b62b87b6..033db4b4 100644 --- a/3rdparty/win32/winsvc.d +++ b/3rdparty/win32/winsvc.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.winsvc; +version(Windows): pragma(lib, "advapi32"); private import win32.w32api, win32.windef; diff --git a/3rdparty/win32/winuser.d b/3rdparty/win32/winuser.d index 9a50d4d7..b91fc31a 100644 --- a/3rdparty/win32/winuser.d +++ b/3rdparty/win32/winuser.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.winuser; +version(Windows): pragma(lib, "user32"); // Conversion Notes: diff --git a/3rdparty/win32/winver.d b/3rdparty/win32/winver.d index d27e1c3a..dc17c022 100644 --- a/3rdparty/win32/winver.d +++ b/3rdparty/win32/winver.d @@ -9,6 +9,7 @@ * Placed into public domain * \***********************************************************************/ module win32.winver; +version(Windows): pragma(lib, "version"); private import win32.windef; diff --git a/3rdparty/win32/ws2tcpip.d b/3rdparty/win32/ws2tcpip.d index 2b5547c3..750ad4b7 100644 --- a/3rdparty/win32/ws2tcpip.d +++ b/3rdparty/win32/ws2tcpip.d @@ -9,6 +9,7 @@ \***********************************************************************/ module win32.ws2tcpip; +version(Windows): import win32.w32api; //import win32.winbase; diff --git a/3rdparty/win32/wtsapi32.d b/3rdparty/win32/wtsapi32.d index b89d0d9c..977e707d 100644 --- a/3rdparty/win32/wtsapi32.d +++ b/3rdparty/win32/wtsapi32.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.wtsapi32; +version(Windows): pragma(lib, "wtsapi32"); private import win32.w32api; import win32.windef; diff --git a/3rdparty/win32/wtypes.d b/3rdparty/win32/wtypes.d index 7442c886..7de7f07c 100644 --- a/3rdparty/win32/wtypes.d +++ b/3rdparty/win32/wtypes.d @@ -8,6 +8,7 @@ * Placed into public domain * \***********************************************************************/ module win32.wtypes; +version(Windows): import win32.rpc, win32.rpcndr; private import win32.windef;