diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-07-10 08:56:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:28:29 -0500 |
| commit | 0c03be55034decf38e13b988b23a38435b29ec45 (patch) | |
| tree | 6970a474048fe35338853ef8f5f2c5182a4d0014 /source3/include | |
| parent | 714209baaa12c3118067249b8da0aaec96868eae (diff) | |
| download | samba-0c03be55034decf38e13b988b23a38435b29ec45.tar.gz samba-0c03be55034decf38e13b988b23a38435b29ec45.tar.bz2 samba-0c03be55034decf38e13b988b23a38435b29ec45.zip | |
r23808: Make us a bit more C++ friendly. Thanks to Constantine Vetoshev
<gepardcv@yahoo.com> for checking.
(This used to be commit 84b8a56fe9aef1e0583cf5f5abb037199cf21fd9)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/rpc_netlogon.h | 6 | ||||
| -rw-r--r-- | source3/include/rpc_svcctl.h | 14 |
2 files changed, 8 insertions, 12 deletions
diff --git a/source3/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h index acd3322784..ca106e93ff 100644 --- a/source3/include/rpc_netlogon.h +++ b/source3/include/rpc_netlogon.h @@ -1147,7 +1147,7 @@ typedef struct net_q_dsr_getdcnameex { } NET_Q_DSR_GETDCNAMEEX; /* NET_R_DSR_GETDCNAMEEX */ -typedef struct NET_R_DSR_GETDCNAME NET_R_DSR_GETDCNAMEEX; +typedef struct net_r_dsr_getdcnameex NET_R_DSR_GETDCNAMEEX; /* NET_Q_DSR_GETDCNAMEEX2 */ typedef struct net_q_dsr_getdcnameex2 { @@ -1165,8 +1165,8 @@ typedef struct net_q_dsr_getdcnameex2 { uint32 flags; } NET_Q_DSR_GETDCNAMEEX2; -/* NET_R_DSR_GETDCNAMEEX */ -typedef struct NET_R_DSR_GETDCNAME NET_R_DSR_GETDCNAMEEX2; +/* NET_R_DSR_GETDCNAMEEX2 */ +typedef struct net_r_dsr_getdcnameex2 NET_R_DSR_GETDCNAMEEX2; /* NET_Q_DSR_GESITENAME */ typedef struct net_q_dsr_getsitename { diff --git a/source3/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h index e212904070..1e42aef20c 100644 --- a/source3/include/rpc_svcctl.h +++ b/source3/include/rpc_svcctl.h @@ -122,15 +122,11 @@ /* utility structures for RPCs */ -typedef struct { - uint32 type; - uint32 state; - uint32 controls_accepted; - WERROR win32_exit_code; - uint32 service_exit_code; - uint32 check_point; - uint32 wait_hint; -} SERVICE_STATUS; +/* + * "struct SERVICE_STATUS" comes from librpc/gen_ndr/svcctl.h + */ + +typedef struct SERVICE_STATUS SERVICE_STATUS; typedef struct { SERVICE_STATUS status; |