* include/wingdi.h (DM_SPECVERSION): Define.

	Thanks to Sinitsyn Valentime <valentine.sinitsyn@usu.ru>
	* include/rpcdce.h (UuidCreateSequential): Properly guard with
	appropriate _WIN32_WINNT values.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index f54dcfd..80c2da7 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,7 +1,14 @@
+2003-04-16  Earnie Boyd  <earnie@users.sf.net>
+
+       * include/wingdi.h (DM_SPECVERSION): Define.
+       Thanks to Sinitsyn Valentime <valentine.sinitsyn@usu.ru>
+       * include/rpcdce.h (UuidCreateSequential): Properly guard with
+       appropriate _WIN32_WINNT values.
+
 2003-04-15  Chris January <chris@atomice.net>
 
-       * rpcdce.h: Add declaration for UuidCreateSequential.
-       * rpcrt4.def: Add entry for UuidCreateSequential.
+       * include/rpcdce.h: Add declaration for UuidCreateSequential.
+       * lib/rpcrt4.def: Add entry for UuidCreateSequential.
 
 2003-04-14  Phil Krylov  <likewolf@users.sourceforge.net>
 

diff --git a/winsup/w32api/include/rpcdce.h b/winsup/w32api/include/rpcdce.h
index 4cd3ff6..f2adce4 100644 (file)
--- a/winsup/w32api/include/rpcdce.h
+++ b/winsup/w32api/include/rpcdce.h
@@ -366,7 +366,6 @@ DECLSPEC_NORETURN void  RPC_ENTRY RpcRaiseException(RPC_STATUS);
 RPC_STATUS RPC_ENTRY RpcTestCancel(void);
 RPC_STATUS RPC_ENTRY RpcCancelThread(void*);
 RPC_STATUS RPC_ENTRY UuidCreate(UUID*);
-RPC_STATUS RPC_ENTRY UuidCreateSequential(UUID*);
 signed int RPC_ENTRY UuidCompare(UUID*,UUID*, RPC_STATUS*);
 RPC_STATUS RPC_ENTRY UuidCreateNil(UUID*);
 int RPC_ENTRY UuidEqual(UUID*,UUID*, RPC_STATUS*);
@@ -381,6 +380,11 @@ RPC_STATUS RPC_ENTRY RpcMgmtInqParameter(unsigned int,unsigned long*);
 RPC_STATUS RPC_ENTRY RpcMgmtSetParameter(unsigned int,unsigned long);
 RPC_STATUS RPC_ENTRY RpcMgmtBindingInqParameter(RPC_BINDING_HANDLE,unsigned int,unsigned long*);
 RPC_STATUS RPC_ENTRY RpcMgmtBindingSetParameter(RPC_BINDING_HANDLE,unsigned int,unsigned long);
+
+#if _WIN32_WINNT >= 0x0500
+RPC_STATUS RPC_ENTRY UuidCreateSequential(UUID*);
+#endif
+
 #include <rpcdcep.h>
 #ifdef __cplusplus
 }

diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h
index 1d79721..287e9f3 100644 (file)
--- a/winsup/w32api/include/wingdi.h
+++ b/winsup/w32api/include/wingdi.h
@@ -1042,6 +1042,7 @@ extern "C" {
 #define DMTT_DOWNLOAD_OUTLINE  4
 #define DMCOLLATE_FALSE        0
 #define DMCOLLATE_TRUE 1
+#define DM_SPECVERSION 800
 #define DM_GRAYSCALE   1
 #define DM_INTERLACED  2
 #define DM_UPDATE      1