[ros-diffs] [akhaldi] 50353: [CMAKE] - Fix wmi and drmk entry points. - Don't use both reactos and wine debug headers in iphlpapi. Fixes the macro redefinition warnings.

Author: akhaldi
Date: Mon Jan 10 20:59:17 2011
New Revision: 50353

URL: http://svn.reactos.org/svn/reactos?rev=50353&view=rev
Log:
[CMAKE]
- Fix wmi and drmk entry points.
- Don't use both reactos and wine debug headers in iphlpapi. Fixes the macro
redefinition warnings.

Modified:
    branches/cmake-bringup/dll/win32/iphlpapi/dhcp_reactos.c
    branches/cmake-bringup/dll/win32/iphlpapi/ifenum_reactos.c
    branches/cmake-bringup/dll/win32/iphlpapi/registry.c
    branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt
    branches/cmake-bringup/drivers/wmi/CMakeLists.txt

Modified: branches/cmake-bringup/dll/win32/iphlpapi/dhcp_reactos.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iphlpap…
==============================================================================
--- branches/cmake-bringup/dll/win32/iphlpapi/dhcp_reactos.c [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/iphlpapi/dhcp_reactos.c [iso-8859-1] Mon Jan 10
20:59:17 2011
@@ -11,9 +11,6 @@
 #include "dhcpcsdk.h"
 #include "dhcpcapi.h"
 #include <assert.h>
-
-#define NDEBUG
-#include "debug.h"
 
 DWORD APIENTRY DhcpRosGetAdapterInfo(DWORD AdapterIndex,
                                      PBOOL DhcpEnabled,

Modified: branches/cmake-bringup/dll/win32/iphlpapi/ifenum_reactos.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iphlpap…
==============================================================================
--- branches/cmake-bringup/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] Mon Jan 10
20:59:17 2011
@@ -40,9 +40,6 @@
 #include "ifenum.h"
 #include <assert.h>
 
-//#define NDEBUG
-#include "debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi);
 
 /* Functions */

Modified: branches/cmake-bringup/dll/win32/iphlpapi/registry.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iphlpap…
==============================================================================
--- branches/cmake-bringup/dll/win32/iphlpapi/registry.c [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/iphlpapi/registry.c [iso-8859-1] Mon Jan 10 20:59:17
2011
@@ -1,6 +1,4 @@
 #include "iphlpapi_private.h"
-
-#include "debug.h"
 
 int GetLongestChildKeyName( HANDLE RegHandle ) {
   LONG Status;

Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio…
==============================================================================
--- branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] Mon Jan
10 20:59:17 2011
@@ -11,6 +11,7 @@
 add_library(drmk SHARED ${SOURCE})
 
 set_module_type(drmk kernelmodedriver)
+set_entrypoint(drmk 0)
 add_importlibs(drmk ntoskrnl)
 add_importlib_target(drmk.spec drmk.sys)
 

Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMake…
==============================================================================
--- branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Mon Jan 10 20:59:17
2011
@@ -9,7 +9,7 @@
 add_library(wmilib SHARED ${SOURCE})
 
 set_module_type(wmilib kernelmodedriver)
-
+set_entrypoint(wmilib 0)
 add_importlibs(wmilib ntoskrnl)
 add_importlib_target(wmilib.spec wmilib.sys)