projects
/
platform
/
upstream
/
freerdp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3983c64
)
Fix conflicting define
author
Hardening
<rdp.effort@gmail.com>
Wed, 25 Jun 2014 15:35:20 +0000
(17:35 +0200)
committer
Hardening
<rdp.effort@gmail.com>
Wed, 25 Jun 2014 15:35:20 +0000
(17:35 +0200)
WTSVirtualEventHandle and WTSVirtualChannelReady are already defined in wtsapi.h
and with different values.
include/freerdp/channels/wtsvc.h
patch
|
blob
|
history
diff --git
a/include/freerdp/channels/wtsvc.h
b/include/freerdp/channels/wtsvc.h
index
df6dead
..
66ee9eb
100644
(file)
--- a/
include/freerdp/channels/wtsvc.h
+++ b/
include/freerdp/channels/wtsvc.h
@@
-37,12
+37,8
@@
#include <winpr/winpr.h>
#include <winpr/wtypes.h>
-
#include <winpr/wtsapi.h>
-#define WTSVirtualEventHandle 3 /* Extended */
-#define WTSVirtualChannelReady 4 /* Extended */
-
#ifdef __cplusplus
extern "C" {
#endif