svn commit: samba r17806 - in branches/SAMBA_3_0: . source/include

[jelmer at samba.org]

Author: jelmer
Date: 2006-08-24 20:27:42 +0000 (Thu, 24 Aug 2006)
New Revision: 17806

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17806

Log:
Make NTTIME a UINT64_S rather than a separate structure consisting of 
two uint32s.

Modified:
   branches/SAMBA_3_0/
   branches/SAMBA_3_0/source/include/rpc_misc.h
   branches/SAMBA_3_0/source/include/smb.h


Changeset:

Property changes on: branches/SAMBA_3_0
___________________________________________________________________
Name: bzr:merge
   - jelmer at samba.org-20060718161613-53e1c111cabecd57
jelmer at samba.org-20060729112811-c224341dc6387f22

   + jelmer at samba.org-20060718161613-53e1c111cabecd57
jelmer at samba.org-20060729112811-c224341dc6387f22
jelmer at samba.org-20060824202535-0923b9ac63b0de61


Modified: branches/SAMBA_3_0/source/include/rpc_misc.h
===================================================================
--- branches/SAMBA_3_0/source/include/rpc_misc.h	2006-08-24 20:17:59 UTC (rev 17805)
+++ branches/SAMBA_3_0/source/include/rpc_misc.h	2006-08-24 20:27:42 UTC (rev 17806)
@@ -357,10 +357,5 @@
 	uint8 data[16];
 } OWF_INFO;
 
-typedef struct uint64_s
-{
-	uint32 low;
-	uint32 high;
-} UINT64_S;
 
 #endif /* _RPC_MISC_H */

Modified: branches/SAMBA_3_0/source/include/smb.h
===================================================================
--- branches/SAMBA_3_0/source/include/smb.h	2006-08-24 20:17:59 UTC (rev 17805)
+++ branches/SAMBA_3_0/source/include/smb.h	2006-08-24 20:27:42 UTC (rev 17806)
@@ -213,13 +213,16 @@
 #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 */
 #define ACB_DISABLED			0x00000001  /* 1 = User account disabled */
 #define ACB_HOMDIRREQ			0x00000002  /* 1 = Home directory required */