summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 */