From e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 10 Feb 2005 05:09:35 +0000 Subject: r5298: - got rid of pstring.h from includes.h. This at least makes it a bit less likely that anyone will use pstring for new code - got rid of winbind_client.h from includes.h. This one triggered a huge change, as winbind_client.h was including system/filesys.h and defining the old uint32 and uint16 types, as well as its own pstring and fstring. (This used to be commit 9db6c79e902ec538108d6b7d3324039aabe1704f) --- source4/include/rap.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'source4/include/rap.h') diff --git a/source4/include/rap.h b/source4/include/rap.h index 0477192d9e..c831f6f007 100644 --- a/source4/include/rap.h +++ b/source4/include/rap.h @@ -286,7 +286,7 @@ struct rap_shareenum_info_0 { struct rap_shareenum_info_1 { char name[13]; char pad; - uint16 type; + uint16_t type; char *comment; }; @@ -297,15 +297,15 @@ union rap_shareenum_info { struct rap_NetShareEnum { struct { - uint16 level; - uint16 bufsize; + uint16_t level; + uint16_t bufsize; } in; struct { - uint16 status; - uint16 convert; - uint16 count; - uint16 available; + uint16_t status; + uint16_t convert; + uint16_t count; + uint16_t available; union rap_shareenum_info *info; } out; }; @@ -329,17 +329,17 @@ union rap_server_info { struct rap_NetServerEnum2 { struct { - uint16 level; - uint16 bufsize; - uint32 servertype; + uint16_t level; + uint16_t bufsize; + uint32_t servertype; const char *domain; } in; struct { - uint16 status; - uint16 convert; - uint16 count; - uint16 available; + uint16_t status; + uint16_t convert; + uint16_t count; + uint16_t available; union rap_server_info *info; } out; }; -- cgit