typedef redefined: SECURITY_INFORMATION

[ischou]

Trying to build 1.7.37 on Mac OS X 10.6.8 today and got an error that the typedef "SECURITY_INFORMATION" is being redefined in svcctl.h and in winnt.h. I can get past the error by commenting out the typedef in svcctl.h, but just wondering if this is something stupid that I've done in configuring/building.

[ischou]

Hmm... Looks like the change that's causing my compile problem was committed just a couple days ago:

http://source.winehq.org/git/wine.git/c ... 6238b984d9

Wondering if anyone else has problems building on Mac OS X since this commit.

[ischou]

No one else has any problems building 1.7.37? I had to do the following to get past my error:

Code: Select all

diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl
index e8463b5..c76bb1b 100644
--- a/include/wine/svcctl.idl
+++ b/include/wine/svcctl.idl
@@ -65,8 +65,6 @@ 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")
 
@@ -333,7 +331,7 @@ typedef [switch_type(DWORD)] union _SC_RPC_SERVICE_CONTROL_O
     /* Function 4 */
     DWORD svcctl_QueryServiceObjectSecurity(
         [in] SC_RPC_HANDLE service,
-        [in] SECURITY_INFORMATION info,
+        [in] DWORD info,
         [out, size_is(buf_size)] BYTE *descriptor,
         [in] DWORD buf_size,
         [out] DWORD *needed_size
@@ -342,7 +340,7 @@ typedef [switch_type(DWORD)] union _SC_RPC_SERVICE_CONTROL_O
     /* Function 5 */
     DWORD svcctl_SetServiceObjectSecurity(
         [in] SC_RPC_HANDLE service,
-        [in] SECURITY_INFORMATION info,
+        [in] DWORD info,
         [in, size_is(buf_size)] BYTE *descriptor,
         [in] DWORD buf_size
     );

[ischou]

Well, in answer to my own post, this seems to have been corrected in 1.7.38 or 1.7.39, because the latest pull builds without needing to mess with the idl file.