summaryrefslogtreecommitdiff
path: root/source4/include
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-11-23 01:53:54 +0000
committerAndrew Tridgell <tridge@samba.org>2003-11-23 01:53:54 +0000
commitd47d14f2ffc7a6d2cc306530b777f364767998b3 (patch)
tree5ff4972c9bea1a5104a2aac2986f2331db96d101 /source4/include
parent7ab05c2ffa87c962a38a9ac90fa5705d93516a57 (diff)
downloadsamba-d47d14f2ffc7a6d2cc306530b777f364767998b3.tar.gz
samba-d47d14f2ffc7a6d2cc306530b777f364767998b3.tar.bz2
samba-d47d14f2ffc7a6d2cc306530b777f364767998b3.zip
reduced the number of magic types we need in mkproto.pl
In general I prefer "struct foo" to just "foo" for most structures. There are exceptions. (This used to be commit 04eb12b56c653f98801ab29411f47564ab32fa58)
Diffstat (limited to 'source4/include')
-rw-r--r--source4/include/includes.h4
-rw-r--r--source4/include/smb.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index e6a25a9b24..0f5e73cf56 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -631,9 +631,9 @@ typedef int socklen_t;
#ifndef SMB_STRUCT_DIRENT
# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_DIRENT64)
-# define SMB_STRUCT_DIRENT struct dirent64
+# define smb_dirent dirent64
# else
-# define SMB_STRUCT_DIRENT struct dirent
+# define smb_dirent dirent
# endif
#endif
diff --git a/source4/include/smb.h b/source4/include/smb.h
index b791182aa6..f6a4281e01 100644
--- a/source4/include/smb.h
+++ b/source4/include/smb.h
@@ -346,7 +346,7 @@ typedef struct sid_info
#define PRIMARY_USER_SID_INDEX 0
#define PRIMARY_GROUP_SID_INDEX 1
-typedef struct _nt_user_token {
+typedef struct nt_user_token {
size_t num_sids;
DOM_SID *user_sids;
} NT_USER_TOKEN;