summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-08-24 20:27:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:49 -0500
commit8d5e7367b196cab1f06b3091f3431058777868d4 (patch)
tree324e9177afece87358e6ca031b4c4321095f3857 /source3
parent49a3f72ebbf2ace388d0b6a488a9ae0b2c5675ac (diff)
downloadsamba-8d5e7367b196cab1f06b3091f3431058777868d4.tar.gz
samba-8d5e7367b196cab1f06b3091f3431058777868d4.tar.bz2
samba-8d5e7367b196cab1f06b3091f3431058777868d4.zip
r17806: Make NTTIME a UINT64_S rather than a separate structure consisting of
two uint32s. (This used to be commit 3556a9c26cf7728e2435bb28e69958751e883ab9)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/rpc_misc.h5
-rw-r--r--source3/include/smb.h9
2 files changed, 6 insertions, 8 deletions
diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index 661d436859..24c7150433 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -357,10 +357,5 @@ typedef struct owf_info {
uint8 data[16];
} OWF_INFO;
-typedef struct uint64_s
-{
- uint32 low;
- uint32 high;
-} UINT64_S;
#endif /* _RPC_MISC_H */
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 9aa8be437c..c5115a551f 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -213,11 +213,14 @@ typedef smb_ucs2_t wfstring[FSTRING_LEN];
#define PI_NTSVCS 14
#define PI_MAX_PIPES 15
-/* 64 bit time (100usec) since ????? - cifs6.txt, section 3.5, page 30 */
-typedef struct nttime_info {
+typedef struct uint64_s
+{
uint32 low;
uint32 high;
-} NTTIME;
+} UINT64_S;
+
+/* 64 bit time (100usec) since ????? - cifs6.txt, section 3.5, page 30 */
+typedef UINT64_S NTTIME;
/* Allowable account control bits */