Author: tkreuzer
Date: Sat Apr 10 19:52:49 2010
New Revision: 46823
URL: http://svn.reactos.org/svn/reactos?rev=46823&view=rev
Log:
[DDK]
Don't define USE_DMA_MACROS for HAL
[MINGW]
Add back cxa_pure_virtual.c
Modified:
branches/ros-amd64-bringup/reactos/include/ddk/ntddk.h
branches/ros-amd64-bringup/reactos/include/ddk/wdm.h
branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild
Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntddk.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/ddk/ntddk.h?rev=46823&r1=46822&r2=46823&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/ddk/ntddk.h [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/include/ddk/ntddk.h [iso-8859-1] Sat Apr
10 19:52:49 2010
@@ -1002,18 +1002,6 @@
} DUMMYSTRUCTNAME;
USHORT AsUSHORT;
} PCI_EXPRESS_PME_REQUESTOR_ID, *PPCI_EXPRESS_PME_REQUESTOR_ID;
-
-#if defined(_WIN64)
-
-#ifndef USE_DMA_MACROS
-#define USE_DMA_MACROS
-#endif
-
-#ifndef NO_LEGACY_DRIVERS
-#define NO_LEGACY_DRIVERS
-#endif
-
-#endif /* defined(_WIN64) */
typedef enum _PHYSICAL_COUNTER_RESOURCE_DESCRIPTOR_TYPE {
ResourceTypeSingle = 0,
Modified: branches/ros-amd64-bringup/reactos/include/ddk/wdm.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/ddk/wdm.h?rev=46823&r1=46822&r2=46823&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/ddk/wdm.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/ddk/wdm.h [iso-8859-1] Sat Apr
10 19:52:49 2010
@@ -3700,7 +3700,7 @@
#if defined(_WIN64)
-#ifndef USE_DMA_MACROS
+#if !defined(USE_DMA_MACROS) && !defined(_NTHAL_)
#define USE_DMA_MACROS
#endif
Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild?rev=46823&r1=46822&r2=46823&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild
[iso-8859-1] Sat Apr 10 19:52:49 2010
@@ -41,6 +41,7 @@
<file>xthdloc.c</file>
<file>xtxtmode.c</file>
<file>ofmt_stub.c</file>
+ <file>cxa_pure_virtual.c</file>
</module>
<module name="mingw_main" type="staticlibrary" isstartuplib="true" crt="dll">
<define name="_CRTBLD" />
