Author: jerry Date: 2007-05-31 15:43:40 +0000 (Thu, 31 May 2007) New Revision: 23268
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23268 Log: Rename some variables in the svcctl.idl to prevent redeclaration compile failures in the generated client code. Modified: branches/SAMBA_3_0/source/librpc/idl/svcctl.idl branches/SAMBA_3_0_26/source/librpc/idl/svcctl.idl Changeset: Modified: branches/SAMBA_3_0/source/librpc/idl/svcctl.idl =================================================================== --- branches/SAMBA_3_0/source/librpc/idl/svcctl.idl 2007-05-31 15:41:46 UTC (rev 23267) +++ branches/SAMBA_3_0/source/librpc/idl/svcctl.idl 2007-05-31 15:43:40 UTC (rev 23268) @@ -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 ); Modified: branches/SAMBA_3_0_26/source/librpc/idl/svcctl.idl =================================================================== --- branches/SAMBA_3_0_26/source/librpc/idl/svcctl.idl 2007-05-31 15:41:46 UTC (rev 23267) +++ branches/SAMBA_3_0_26/source/librpc/idl/svcctl.idl 2007-05-31 15:43:40 UTC (rev 23268) @@ -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 );