diff options
| author | Zach Loafman <zachary.loafman@isilon.com> | 2008-07-03 12:21:33 -0700 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-07-22 15:00:48 +0200 |
| commit | 863a6aa07e543e30f2075a597129f6c39222beef (patch) | |
| tree | cc6baa5ff81890025dfb33624852ecb2ae6d3add /source3/rpc_server/srv_winreg_nt.c | |
| parent | 06d0790c0799112b89534a646e78d0cb38b06e20 (diff) | |
| download | samba-863a6aa07e543e30f2075a597129f6c39222beef.tar.gz samba-863a6aa07e543e30f2075a597129f6c39222beef.tar.bz2 samba-863a6aa07e543e30f2075a597129f6c39222beef.zip | |
Fix warnings on FreeBSD-based platforms
Fix two shadowed declaration warnings on FreeBSD-based platform:
'reboot' is a 4.0BSD syscall in unistd.h and 'tcp_seq' is a typedef in
netinet/tcp.h.
(This used to be commit 14d2a4da1da38d6f69c63505d35990322f253e5d)
Diffstat (limited to 'source3/rpc_server/srv_winreg_nt.c')
| -rw-r--r-- | source3/rpc_server/srv_winreg_nt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c index 84bcf0bf89..3991c5ae02 100644 --- a/source3/rpc_server/srv_winreg_nt.c +++ b/source3/rpc_server/srv_winreg_nt.c @@ -475,7 +475,7 @@ WERROR _winreg_InitiateSystemShutdown(pipes_struct *p, struct winreg_InitiateSys s.in.message = r->in.message; s.in.timeout = r->in.timeout; s.in.force_apps = r->in.force_apps; - s.in.reboot = r->in.reboot; + s.in.do_reboot = r->in.do_reboot; s.in.reason = 0; /* thunk down to _winreg_InitiateSystemShutdownEx() @@ -499,7 +499,7 @@ WERROR _winreg_InitiateSystemShutdownEx(pipes_struct *p, struct winreg_InitiateS char *chkmsg = NULL; fstring str_timeout; fstring str_reason; - fstring reboot; + fstring do_reboot; fstring f; int ret; bool can_shutdown; @@ -526,7 +526,7 @@ WERROR _winreg_InitiateSystemShutdownEx(pipes_struct *p, struct winreg_InitiateS } fstr_sprintf(str_timeout, "%d", r->in.timeout); - fstr_sprintf(reboot, r->in.reboot ? SHUTDOWN_R_STRING : ""); + fstr_sprintf(do_reboot, r->in.do_reboot ? SHUTDOWN_R_STRING : ""); fstr_sprintf(f, r->in.force_apps ? SHUTDOWN_F_STRING : ""); fstr_sprintf(str_reason, "%d", r->in.reason ); @@ -541,7 +541,7 @@ WERROR _winreg_InitiateSystemShutdownEx(pipes_struct *p, struct winreg_InitiateS return WERR_NOMEM; } shutdown_script = talloc_all_string_sub(p->mem_ctx, - shutdown_script, "%r", reboot); + shutdown_script, "%r", do_reboot); if (!shutdown_script) { return WERR_NOMEM; } |