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/librpc/gen_ndr/winreg.h | |
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/librpc/gen_ndr/winreg.h')
-rw-r--r-- | source3/librpc/gen_ndr/winreg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/librpc/gen_ndr/winreg.h b/source3/librpc/gen_ndr/winreg.h index e765890f73..4a06e3bc83 100644 --- a/source3/librpc/gen_ndr/winreg.h +++ b/source3/librpc/gen_ndr/winreg.h @@ -479,7 +479,7 @@ struct winreg_InitiateSystemShutdown { struct initshutdown_String *message;/* [unique] */ uint32_t timeout; uint8_t force_apps; - uint8_t reboot; + uint8_t do_reboot; } in; struct { @@ -567,7 +567,7 @@ struct winreg_InitiateSystemShutdownEx { struct initshutdown_String *message;/* [unique] */ uint32_t timeout; uint8_t force_apps; - uint8_t reboot; + uint8_t do_reboot; uint32_t reason; } in; |