include: Move cfgmgr32.h to include/ to match the SDK

[James Hawkins]

Hi,

This version includes the necessary changes to include/Makefile.in

Changelog:
* Move cfgmgr32.h to include/ to match the SDK.

 dlls/cfgmgr32/main.c    |    2 +-
 dlls/setupapi/devinst.c |    2 +-
 include/Makefile.in     |    2 +-
 include/cfgmgr32.h      |   34 ++++++++++++++++++++++++++++++++++
 include/ddk/cfgmgr32.h  |   34 ----------------------------------
 5 files changed, 37 insertions(+), 37 deletions(-)

-- 
James Hawkins
-------------- next part --------------
diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c
index 8f44961..9f27a29 100644
--- a/dlls/cfgmgr32/main.c
+++ b/dlls/cfgmgr32/main.c
@@ -23,7 +23,7 @@ #include <stdarg.h>
 #include "windef.h"
 #include "winbase.h"
 #include "winnt.h"
-#include "ddk/cfgmgr32.h"
+#include "cfgmgr32.h"
 
 #include "wine/debug.h"
 
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 99a9950..cc32107 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -34,7 +34,7 @@ #include "winnls.h"
 #include "setupapi.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"
-#include "ddk/cfgmgr32.h"
+#include "cfgmgr32.h"
 #include "initguid.h"
 #include "winioctl.h"
 #include "rpc.h"
diff --git a/include/Makefile.in b/include/Makefile.in
index 2dc8fb0..4b959bc 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -76,6 +76,7 @@ WINDOWS_INCLUDES = \
 	basetsd.h \
 	basetyps.h \
 	cderr.h \
+	cfgmgr32.h \
 	cguid.h \
 	cierror.h \
 	clusapi.h \
@@ -104,7 +105,6 @@ WINDOWS_INCLUDES = \
 	dciman.h \
 	dde.h \
 	ddeml.h \
-	ddk/cfgmgr32.h \
 	ddk/compstui.h \
 	ddk/ntddcdvd.h \
 	ddk/ntddser.h \
diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h
new file mode 100644
index 0000000..c5a4a25
--- /dev/null
+++ b/include/cfgmgr32.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2005 Mike McCormack
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef _CFGMGR32_H_
+#define _CFGMGR32_H_
+
+typedef DWORD CONFIGRET;
+
+#define CR_SUCCESS 0
+
+#define MAX_CLASS_NAME_LEN  32
+#define MAX_GUID_STRING_LEN 39
+#define MAX_PROFILE_LEN     80
+
+CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR, PCHAR, ULONG, ULONG );
+CONFIGRET WINAPI CM_Get_Device_ID_ListW( PCWSTR, PWCHAR, ULONG, ULONG );
+#define     CM_Get_Device_ID_List WINELIB_NAME_AW(CM_Get_Device_ID_List)
+
+#endif /* _CFGMGR32_H_ */
diff --git a/include/ddk/cfgmgr32.h b/include/ddk/cfgmgr32.h
deleted file mode 100644
index c5a4a25..0000000
--- a/include/ddk/cfgmgr32.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2005 Mike McCormack
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _CFGMGR32_H_
-#define _CFGMGR32_H_
-
-typedef DWORD CONFIGRET;
-
-#define CR_SUCCESS 0
-
-#define MAX_CLASS_NAME_LEN  32
-#define MAX_GUID_STRING_LEN 39
-#define MAX_PROFILE_LEN     80
-
-CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR, PCHAR, ULONG, ULONG );
-CONFIGRET WINAPI CM_Get_Device_ID_ListW( PCWSTR, PWCHAR, ULONG, ULONG );
-#define     CM_Get_Device_ID_List WINELIB_NAME_AW(CM_Get_Device_ID_List)
-
-#endif /* _CFGMGR32_H_ */
-- 
1.4.2.1