Index: ossp-pkg/as/as-gui/as_uuid.cpp
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/as_uuid.cpp,v
rcsdiff -q -kk '-r1.9' '-r1.10' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/as_uuid.cpp,v' 2>/dev/null
--- as_uuid.cpp	2003/01/24 19:44:40	1.9
+++ as_uuid.cpp	2003/02/04 19:39:44	1.10
@@ -29,9 +29,11 @@
 //  as_uuid.cpp: ISO C++ implementation
 //
 
+// System headers
 #include <string>
 #include <sys/socket.h>
 
+// Local headers
 #include "as_uuid.h"
 #include "as_rand.h"
 
@@ -80,8 +82,8 @@
 //
 void Uuid::setId(const unsigned char *pkucData)
 {
-    const __u8 *pOctet = pkucData;
-    __u32       Tmpdat;
+    const U8 *pOctet = pkucData;
+    U32       Tmpdat;
 
     Tmpdat = *pOctet++; // Tmpdat is our iterator
 
Index: ossp-pkg/as/as-gui/as_uuid.h
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/as_uuid.h,v
rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/as_uuid.h,v' 2>/dev/null
--- as_uuid.h	2003/02/03 21:15:16	1.6
+++ as_uuid.h	2003/02/04 19:39:44	1.7
@@ -34,82 +34,10 @@
 
 #include <string>
 
-#ifdef HAVE_CONFIG_H
-#include "ac_config.h"
-#endif
+#include "as_gui.h"
 
 namespace AS {
 
-#ifdef HAVE_CONFIG_H
-#if (SIZEOF_CHAR == 1)
-typedef unsigned char        __u8;
-#else
-?==Error: Undefined 8 bit type
-#endif // __u8
-
-#if (SIZEOF_SHORT == 2)
-typedef unsigned short       __u16;
-#elif (SIZEOF_INT == 2)
-typedef unsigned int         __u16;
-#elif (SIZEOF_LONG == 2)
-typedef unsigned long        __u16;
-#else
-?==Error: Undefined 16 bit type
-#endif // __u16
-
-#if (SIZEOF_SHORT == 4)
-typedef unsigned short       __u32;
-#elif (SIZEOF_INT == 4)
-typedef unsigned int         __u32;
-#elif (SIZEOF_LONG == 4)
-typedef unsigned long        __u32;
-#else
-?==Error: Undefined 32 bit type
-#endif // __u32
-
-#if (SIZEOF_SHORT == 8)
-typedef unsigned short       __u64;
-#elif (SIZEOF_INT == 8)
-typedef unsigned int         __u64;
-#elif (SIZEOF_LONG == 8)
-typedef unsigned long        __u64;
-#elif (SIZEOF_LONG_LONG == 8)
-typedef unsigned long long   __u64;
-#else
-?==Error: Undefined 64 bit type
-#endif // __u64
-
-#else // HAVE_CONFIG_H (not defined)
-typedef unsigned char        __u8;
-#if (4 == 8)
-typedef unsigned int         __u64;
-#elif (4 == 8)
-typedef unsigned long        __u64;
-#elif (8 == 8)
-typedef unsigned long long   __u64;
-#else
-?==Error: Undefined 64 bit type
-#endif
-
-#if (4 == 2)
-typedef	unsigned int         __u16;
-#elif (2 == 2)
-typedef	unsigned short       __u16;
-#else
-?==Error: Undefined 16 bit type
-#endif
-
-#if (4 == 4)
-typedef	unsigned int         __u32;
-#elif (4 == 4)
-typedef	unsigned long        __u32;
-#elif (2 == 4)
-typedef	unsigned short       __u32;
-#else
-?== Error: Undefined 32 bit type
-#endif
-#endif // HAVE_CONFIG_H
-
 
 //
 // A DCE standard UUID, can generate (multiple)
@@ -119,11 +47,11 @@
 {
 private:
     std::string m_Fmtstr;               // Human readable format
-    __u32   time_low;                   //
-    __u16   time_mid;                   // Fields according to
-    __u16   time_hi_and_version;        // the IETF specification
-    __u16   clock_seq;                  // draft-mealling-uuid-urn-00
-    __u8    node[6];                    //
+    U32 time_low;                       //
+    U16 time_mid;                       // Fields according to
+    U16 time_hi_and_version;            // the IETF specification
+    U16 clock_seq;                      // draft-mealling-uuid-urn-00
+    U8  node[6];                        //
 
 public:
     void genId(void);                   // Generate an UUID