2010-09-10 Jonathan Yong <jon_y@users.sourceforge.net> * mingw_inc: Rename to psdk_inc. * dbghelp.h: Fix up mingw_inc rename. * imagehlp.h: Likewise. * ks.h: Likewise. * mswsock.h: Likewise. * winsock.h: Likewise. * winsock2.h: Likewise. * ws2tcpip.h: Likewise. * wtypes.h: Likewise. * zmouse.h: Likewise. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@3546 4407c894-4637-0410-b4f5-ada5f102cad1

diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index e3b7cef..c8e5748 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog

@@ -1,3 +1,16 @@
+2010-09-10  Jonathan Yong  <jon_y@users.sourceforge.net>
+
+	* mingw_inc: Rename to psdk_inc.
+	* dbghelp.h: Fix up mingw_inc rename.
+	* imagehlp.h: Likewise.
+	* ks.h: Likewise.
+	* mswsock.h: Likewise.
+	* winsock.h: Likewise.
+	* winsock2.h: Likewise.
+	* ws2tcpip.h: Likewise.
+	* wtypes.h: Likewise.
+	* zmouse.h: Likewise.
+
 2010-09-07  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* dbghelp.h, imagehlp.h (API_VERSION_NUMBER): Change from 9 to 11.

diff --git a/mingw-w64-headers/include/dbghelp.h b/mingw-w64-headers/include/dbghelp.h
index 2a54013..97bfcd6 100644
--- a/mingw-w64-headers/include/dbghelp.h
+++ b/mingw-w64-headers/include/dbghelp.h

@@ -17,8 +17,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include <mingw_inc/_dbg_LOAD_IMAGE.h>
-#include <mingw_inc/_dbg_common.h>
+#include <psdk_inc/_dbg_LOAD_IMAGE.h>
+#include <psdk_inc/_dbg_common.h>
 
 #ifdef __cplusplus
 }

diff --git a/mingw-w64-headers/include/imagehlp.h b/mingw-w64-headers/include/imagehlp.h
index 4c65788..7aaa136 100644
--- a/mingw-w64-headers/include/imagehlp.h
+++ b/mingw-w64-headers/include/imagehlp.h

@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#include <mingw_inc/_dbg_LOAD_IMAGE.h>
+#include <psdk_inc/_dbg_LOAD_IMAGE.h>
 
   typedef enum _IMAGEHLP_STATUS_REASON {
     BindOutOfMemory,
@@ -103,7 +103,7 @@
   WINBOOL IMAGEAPI UpdateDebugInfoFile(PCSTR ImageFileName,PCSTR SymbolPath,PSTR DebugFilePath,PIMAGE_NT_HEADERS32 NtHeaders);
   WINBOOL IMAGEAPI UpdateDebugInfoFileEx(PCSTR ImageFileName,PCSTR SymbolPath,PSTR DebugFilePath,PIMAGE_NT_HEADERS32 NtHeaders,DWORD OldChecksum);
 
-#include <mingw_inc/_dbg_common.h>
+#include <psdk_inc/_dbg_common.h>
 
 #ifdef __cplusplus
 }

diff --git a/mingw-w64-headers/include/ks.h b/mingw-w64-headers/include/ks.h
index f518be6..bb7c315 100644
--- a/mingw-w64-headers/include/ks.h
+++ b/mingw-w64-headers/include/ks.h

@@ -132,7 +132,7 @@
 #define KSPROPTYPESETID_General DEFINE_GUIDNAMED(KSPROPTYPESETID_General)
 
 #if defined(_NTDDK_)
-#include <mingw_inc/_varenum.h>
+#include <psdk_inc/_varenum.h>
 #endif
 
 typedef struct {

diff --git a/mingw-w64-headers/include/mswsock.h b/mingw-w64-headers/include/mswsock.h
index 3b60032..5fd8b14 100644
--- a/mingw-w64-headers/include/mswsock.h
+++ b/mingw-w64-headers/include/mswsock.h

@@ -62,7 +62,7 @@
 #define TF_USE_SYSTEM_THREAD 0x10
 #define TF_USE_KERNEL_APC 0x20
 
-#include <mingw_inc/_xmitfile.h>
+#include <psdk_inc/_xmitfile.h>
 #ifndef __MSWSOCK_WS1_SHARED
   WINBOOL WINAPI TransmitFile(SOCKET hSocket,HANDLE hFile,DWORD nNumberOfBytesToWrite,DWORD nNumberOfBytesPerSend,LPOVERLAPPED lpOverlapped,LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers,DWORD dwReserved);
   WINBOOL WINAPI AcceptEx(SOCKET sListenSocket,SOCKET sAcceptSocket,PVOID lpOutputBuffer,DWORD dwReceiveDataLength,DWORD dwLocalAddressLength,DWORD dwRemoteAddressLength,LPDWORD lpdwBytesReceived,LPOVERLAPPED lpOverlapped);

diff --git a/mingw-w64-headers/include/mingw_inc/_dbg_LOAD_IMAGE.h b/mingw-w64-headers/include/psdk_inc/_dbg_LOAD_IMAGE.h
similarity index 100%
rename from mingw-w64-headers/include/mingw_inc/_dbg_LOAD_IMAGE.h
rename to mingw-w64-headers/include/psdk_inc/_dbg_LOAD_IMAGE.h


diff --git a/mingw-w64-headers/include/mingw_inc/_dbg_common.h b/mingw-w64-headers/include/psdk_inc/_dbg_common.h
similarity index 100%
rename from mingw-w64-headers/include/mingw_inc/_dbg_common.h
rename to mingw-w64-headers/include/psdk_inc/_dbg_common.h


diff --git a/mingw-w64-headers/include/mingw_inc/_fd_types.h b/mingw-w64-headers/include/psdk_inc/_fd_types.h
similarity index 100%
rename from mingw-w64-headers/include/mingw_inc/_fd_types.h
rename to mingw-w64-headers/include/psdk_inc/_fd_types.h


diff --git a/mingw-w64-headers/include/mingw_inc/_ip_mreq1.h b/mingw-w64-headers/include/psdk_inc/_ip_mreq1.h
similarity index 100%
rename from mingw-w64-headers/include/mingw_inc/_ip_mreq1.h
rename to mingw-w64-headers/include/psdk_inc/_ip_mreq1.h


diff --git a/mingw-w64-headers/include/mingw_inc/_ip_types.h b/mingw-w64-headers/include/psdk_inc/_ip_types.h
similarity index 100%
rename from mingw-w64-headers/include/mingw_inc/_ip_types.h
rename to mingw-w64-headers/include/psdk_inc/_ip_types.h


diff --git a/mingw-w64-headers/include/mingw_inc/_pop_BOOL.h b/mingw-w64-headers/include/psdk_inc/_pop_BOOL.h
similarity index 100%
rename from mingw-w64-headers/include/mingw_inc/_pop_BOOL.h
rename to mingw-w64-headers/include/psdk_inc/_pop_BOOL.h


diff --git a/mingw-w64-headers/include/mingw_inc/_push_BOOL.h b/mingw-w64-headers/include/psdk_inc/_push_BOOL.h
similarity index 100%
rename from mingw-w64-headers/include/mingw_inc/_push_BOOL.h
rename to mingw-w64-headers/include/psdk_inc/_push_BOOL.h


diff --git a/mingw-w64-headers/include/mingw_inc/_socket_types.h b/mingw-w64-headers/include/psdk_inc/_socket_types.h
similarity index 100%
rename from mingw-w64-headers/include/mingw_inc/_socket_types.h
rename to mingw-w64-headers/include/psdk_inc/_socket_types.h


diff --git a/mingw-w64-headers/include/mingw_inc/_varenum.h b/mingw-w64-headers/include/psdk_inc/_varenum.h
similarity index 100%
rename from mingw-w64-headers/include/mingw_inc/_varenum.h
rename to mingw-w64-headers/include/psdk_inc/_varenum.h


diff --git a/mingw-w64-headers/include/mingw_inc/_ws1_undef.h b/mingw-w64-headers/include/psdk_inc/_ws1_undef.h
similarity index 100%
rename from mingw-w64-headers/include/mingw_inc/_ws1_undef.h
rename to mingw-w64-headers/include/psdk_inc/_ws1_undef.h


diff --git a/mingw-w64-headers/include/mingw_inc/_wsa_errnos.h b/mingw-w64-headers/include/psdk_inc/_wsa_errnos.h
similarity index 100%
rename from mingw-w64-headers/include/mingw_inc/_wsa_errnos.h
rename to mingw-w64-headers/include/psdk_inc/_wsa_errnos.h


diff --git a/mingw-w64-headers/include/mingw_inc/_wsadata.h b/mingw-w64-headers/include/psdk_inc/_wsadata.h
similarity index 100%
rename from mingw-w64-headers/include/mingw_inc/_wsadata.h
rename to mingw-w64-headers/include/psdk_inc/_wsadata.h


diff --git a/mingw-w64-headers/include/mingw_inc/_xmitfile.h b/mingw-w64-headers/include/psdk_inc/_xmitfile.h
similarity index 100%
rename from mingw-w64-headers/include/mingw_inc/_xmitfile.h
rename to mingw-w64-headers/include/psdk_inc/_xmitfile.h


diff --git a/mingw-w64-headers/include/winsock.h b/mingw-w64-headers/include/winsock.h
index ccd8868..02270c1 100644
--- a/mingw-w64-headers/include/winsock.h
+++ b/mingw-w64-headers/include/winsock.h

@@ -26,12 +26,12 @@
 #include <_timeval.h>
 #include <_bsd_types.h>
 #include <inaddr.h>
-#include <mingw_inc/_socket_types.h>
-#include <mingw_inc/_fd_types.h>
-#include <mingw_inc/_ip_types.h>
-#include <mingw_inc/_ip_mreq1.h>
-#include <mingw_inc/_wsadata.h>
-#include <mingw_inc/_xmitfile.h>
+#include <psdk_inc/_socket_types.h>
+#include <psdk_inc/_fd_types.h>
+#include <psdk_inc/_ip_types.h>
+#include <psdk_inc/_ip_mreq1.h>
+#include <psdk_inc/_wsadata.h>
+#include <psdk_inc/_xmitfile.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -294,7 +294,7 @@
 #define FD_CONNECT 0x10
 #define FD_CLOSE 0x20
 
-#include <mingw_inc/_wsa_errnos.h>
+#include <psdk_inc/_wsa_errnos.h>
 
 /* these 46 functions have the same prototypes as in winsock2 */
   WINSOCK_API_LINKAGE SOCKET WSAAPI accept(SOCKET s,struct sockaddr *addr,int *addrlen);

diff --git a/mingw-w64-headers/include/winsock2.h b/mingw-w64-headers/include/winsock2.h
index ae5679e..310b3a3 100644
--- a/mingw-w64-headers/include/winsock2.h
+++ b/mingw-w64-headers/include/winsock2.h

@@ -41,15 +41,15 @@
 #define WSAAPI			WINAPI
 
 /* undefine macros from winsock.h */
-#include <mingw_inc/_ws1_undef.h>
+#include <psdk_inc/_ws1_undef.h>
 
 #include <_timeval.h>
 #include <_bsd_types.h>
 #include <inaddr.h>
-#include <mingw_inc/_socket_types.h>
-#include <mingw_inc/_fd_types.h>
-#include <mingw_inc/_ip_types.h>
-#include <mingw_inc/_wsadata.h>
+#include <psdk_inc/_socket_types.h>
+#include <psdk_inc/_fd_types.h>
+#include <psdk_inc/_ip_types.h>
+#include <psdk_inc/_wsadata.h>
 #include <ws2def.h> /* FIXME: include order */
 
 #ifdef __cplusplus
@@ -376,7 +376,7 @@
 #define FD_MAX_EVENTS 10
 #define FD_ALL_EVENTS ((1 << FD_MAX_EVENTS) - 1)
 
-#include <mingw_inc/_wsa_errnos.h>
+#include <psdk_inc/_wsa_errnos.h>
 
 #define WSAEVENT HANDLE
 #define LPWSAEVENT LPHANDLE

diff --git a/mingw-w64-headers/include/ws2tcpip.h b/mingw-w64-headers/include/ws2tcpip.h
index b5fdb25..824edf0 100644
--- a/mingw-w64-headers/include/ws2tcpip.h
+++ b/mingw-w64-headers/include/ws2tcpip.h

@@ -9,7 +9,7 @@
 #include <_mingw_unicode.h>
 
 #include <winsock2.h>
-#include <mingw_inc/_ip_mreq1.h>
+#include <psdk_inc/_ip_mreq1.h>
 
 struct ip_mreq_source {
   struct in_addr imr_multiaddr;

diff --git a/mingw-w64-headers/include/wtypes.h b/mingw-w64-headers/include/wtypes.h
index 365d729..7b915e3 100644
--- a/mingw-w64-headers/include/wtypes.h
+++ b/mingw-w64-headers/include/wtypes.h

@@ -621,7 +621,7 @@
 #define CBPCLIPDATA(clipdata) ((clipdata).cbSize - sizeof((clipdata).ulClipFmt))
   typedef unsigned short VARTYPE;
 
-#include <mingw_inc/_varenum.h>
+#include <psdk_inc/_varenum.h>
 
   typedef ULONG PROPID;
 

diff --git a/mingw-w64-headers/include/zmouse.h b/mingw-w64-headers/include/zmouse.h
index 70942e6..dd73a41 100644
--- a/mingw-w64-headers/include/zmouse.h
+++ b/mingw-w64-headers/include/zmouse.h

@@ -5,7 +5,7 @@
  */
 
 #include <_mingw_unicode.h>
-#include <mingw_inc/_push_BOOL.h>
+#include <psdk_inc/_push_BOOL.h>
 
 #define MSH_MOUSEWHEEL __MINGW_STRING_AW("MSWHEEL_ROLLMSG")
 
@@ -46,5 +46,5 @@
   return(hdlMsWheel);
 }
 #endif /* !__CRT__NO_INLINE */
-#include <mingw_inc/_pop_BOOL.h>
+#include <psdk_inc/_pop_BOOL.h>