From: Gerald Carter <jerry@samba.org>
Date: Thu, 31 May 2007 15:43:40 +0000 (+0000)
Subject: r23268: Rename some variables in the svcctl.idl to prevent
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~307
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87b37de8ad4e91e75530996dde0900b6e1fed622;p=thirdparty%2Fsamba.git

r23268: Rename some variables in the svcctl.idl to prevent
redeclaration compile failures in the generated client
code.
---

diff --git a/source/librpc/idl/svcctl.idl b/source/librpc/idl/svcctl.idl
index 599d961fbe1..c2ede616ee9 100644
--- a/source/librpc/idl/svcctl.idl
+++ b/source/librpc/idl/svcctl.idl
@@ -96,7 +96,7 @@
 	WERROR svcctl_ControlService(
 		[in,ref] policy_handle *handle,
 		[in] uint32 control,
-		[out,ref] SERVICE_STATUS *status
+		[out,ref] SERVICE_STATUS *service_status
 	);
 
 	/*****************/
@@ -127,7 +127,7 @@
 	/* Function 0x06 */
 	WERROR svcctl_QueryServiceStatus(
 		[in,ref] policy_handle *handle,
-		[out,ref] SERVICE_STATUS *status
+		[out,ref] SERVICE_STATUS *service_status
 	);
 
 	/*****************/
@@ -197,7 +197,7 @@
 	WERROR svcctl_EnumDependentServicesW(
 		[in,ref] policy_handle *service,
 		[in] uint32 state,
-		[out] ENUM_SERVICE_STATUS *status,
+		[out] ENUM_SERVICE_STATUS *service_status,
 		[in] uint32 buf_size,
 		[out,ref] uint32 *bytes_needed,
 		[out,ref] uint32 *services_returned
@@ -248,7 +248,7 @@
 	WERROR svcctl_QueryServiceLockStatusW(
 		[in,ref] policy_handle *handle,
 		[in] uint32 buf_size,
-		[out,ref] SERVICE_LOCK_STATUS *status,
+		[out,ref] SERVICE_LOCK_STATUS *lock_status,
 		[out,ref] uint32 *required_buf_size
 	);
 
@@ -326,7 +326,7 @@
 	WERROR svcctl_EnumDependentServicesA(
 		[in,ref] policy_handle *service,
 		[in] uint32 state,
-		[out] ENUM_SERVICE_STATUS *status,
+		[out] ENUM_SERVICE_STATUS *service_status,
 		[in] uint32 buf_size,
 		[out,ref] uint32 *bytes_needed,
 		[out,ref] uint32 *services_returned
@@ -376,7 +376,7 @@
 	WERROR svcctl_QueryServiceLockStatusA(
 		[in,ref] policy_handle *handle,
 		[in] uint32 buf_size,
-		[out,ref] SERVICE_LOCK_STATUS *status,
+		[out,ref] SERVICE_LOCK_STATUS *lock_status,
 		[out,ref] uint32 *required_buf_size
 	);