summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarnie Boyd <earnie@users.sf.net>2003-04-16 12:19:57 +0000
committerEarnie Boyd <earnie@users.sf.net>2003-04-16 12:19:57 +0000
commit8425a8ce499b9e9d15ff13d44d19f4b5cafbeb67 (patch)
tree4f68aa56b66bba1c52d00b40ac228a3df9dba5dc
parent08c76ba660d059fb3f5fdd4c405e250f1741b13e (diff)
downloadcygnal-8425a8ce499b9e9d15ff13d44d19f4b5cafbeb67.tar.gz
cygnal-8425a8ce499b9e9d15ff13d44d19f4b5cafbeb67.tar.bz2
cygnal-8425a8ce499b9e9d15ff13d44d19f4b5cafbeb67.zip
* 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.
-rw-r--r--winsup/w32api/ChangeLog11
-rw-r--r--winsup/w32api/include/rpcdce.h6
-rw-r--r--winsup/w32api/include/wingdi.h1
3 files changed, 15 insertions, 3 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index f54dcfd1a..80c2da7a7 100644
--- 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 4cd3ff612..f2adce40f 100644
--- 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 1d7972154..287e9f3d1 100644
--- 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