Francois Gouget : advapi32: Avoid defining SECURITY_INFORMATION multiple times.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8d52f0964616c68464f79d92500de46840884c82
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8d52f0964616c68464f79d9250...

Author: Francois Gouget 
Date:   Sat Feb 28 20:00:33 2015 +0100

advapi32: Avoid defining SECURITY_INFORMATION multiple times.

---

include/wine/svcctl.idl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl
index e8463b5..4af6b9a 100644
--- a/include/wine/svcctl.idl
+++ b/include/wine/svcctl.idl
@@ -65,12 +65,13 @@ interface svcctl
     typedef [context_handle] void *SC_RPC_LOCK;
     typedef [context_handle] void *SC_NOTIFY_RPC_HANDLE;

-    typedef DWORD SECURITY_INFORMATION;
-
     /* undocumented access rights */
     cpp_quote("#define SERVICE_SET_STATUS   0x8000")

-cpp_quote("#if 0 /* already defined in winsvc.h */")
+cpp_quote("#if 0 /* already defined in winsvc.h / winnt.h */")
+
+typedef DWORD SECURITY_INFORMATION;
+
 typedef struct _QUERY_SERVICE_CONFIGA {
     DWORD   dwServiceType;
     DWORD   dwStartType;