summaryrefslogtreecommitdiff
path: root/source3/librpc/idl
diff options
context:
space:
mode:
authorZach Loafman <zachary.loafman@isilon.com>2008-07-03 12:21:33 -0700
committerVolker Lendecke <vl@samba.org>2008-07-22 15:00:48 +0200
commit863a6aa07e543e30f2075a597129f6c39222beef (patch)
treecc6baa5ff81890025dfb33624852ecb2ae6d3add /source3/librpc/idl
parent06d0790c0799112b89534a646e78d0cb38b06e20 (diff)
downloadsamba-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/idl')
-rw-r--r--source3/librpc/idl/initshutdown.idl4
-rw-r--r--source3/librpc/idl/winreg.idl4
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/librpc/idl/initshutdown.idl b/source3/librpc/idl/initshutdown.idl
index 868e48e28a..8815a9a29e 100644
--- a/source3/librpc/idl/initshutdown.idl
+++ b/source3/librpc/idl/initshutdown.idl
@@ -28,7 +28,7 @@
[in,unique] initshutdown_String *message,
[in] uint32 timeout,
[in] uint8 force_apps,
- [in] uint8 reboot
+ [in] uint8 do_reboot
);
WERROR initshutdown_Abort(
@@ -40,7 +40,7 @@
[in,unique] initshutdown_String *message,
[in] uint32 timeout,
[in] uint8 force_apps,
- [in] uint8 reboot,
+ [in] uint8 do_reboot,
[in] uint32 reason
);
}
diff --git a/source3/librpc/idl/winreg.idl b/source3/librpc/idl/winreg.idl
index 2183a2cb2d..2f02419af5 100644
--- a/source3/librpc/idl/winreg.idl
+++ b/source3/librpc/idl/winreg.idl
@@ -307,7 +307,7 @@ import "lsa.idl", "initshutdown.idl", "security.idl";
[in,unique] initshutdown_String *message,
[in] uint32 timeout,
[in] uint8 force_apps,
- [in] uint8 reboot
+ [in] uint8 do_reboot
);
/******************/
@@ -363,7 +363,7 @@ import "lsa.idl", "initshutdown.idl", "security.idl";
[in,unique] initshutdown_String *message,
[in] uint32 timeout,
[in] uint8 force_apps,
- [in] uint8 reboot,
+ [in] uint8 do_reboot,
[in] uint32 reason
);