[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtutil.h

Comparing rxvt-unicode/src/rxvtutil.h (file contents):
Revision 1.40 by sf-exg, Mon Jul 26 09:57:53 2010 UTC vs.
Revision 1.44 by root, Mon Jan 3 18:52:41 2011 UTC

 #ifndef RXVT_UTIL_H
 #define RXVT_UTIL_H
 #include <cstdlib>
 #include <cstring>
+#include <inttypes.h>
 using namespace std;
+#define ARRAY_LENGTH(v) (sizeof (v) / sizeof ((v)[0]))
 #define PP_CONCAT_(a, b) a ## b
 #define PP_CONCAT(a, b) PP_CONCAT_(a, b)
 #define PP_STRINGIFY_(a) #a
 #define PP_STRINGIFY(a) PP_STRINGIFY_(a)
 #else
 # define NOTHROW  throw()
 # define THROW(x) throw x
 #endif
-extern class byteorder {
+namespace byteorder {
-  static unsigned int e; // at least 32 bits
+  static unsigned char e ()
-public:
+  {
-  byteorder ();
+    const uint32_t u = 0x11223344;
+    return *(unsigned char *)&u;
+  }
-  static bool big_endian    () { return e == 0x11223344; };
+  static bool big_endian    () { return e () == 0x11;     };
-  static bool network       () { return e == 0x11223344; };
+  static bool network       () { return big_endian ();    };
-  static bool little_endian () { return e == 0x44332211; };
+  static bool little_endian () { return e () == 0x44;     };
-  static bool vax           () { return e == 0x44332211; };
+  static bool vax           () { return little_endian (); };
-} byteorder;
+};
 // various utility functions
 template<typename T, typename U> static inline T    min    (T  a, U b) { return a < (T)b ? a : (T)b; }
 template<typename T, typename U> static inline void min_it (T &a, U b) {    a = a < (T)b ? a : (T)b; }
 template<typename T, typename U> static inline T    max    (T  a, U b) { return a > (T)b ? a : (T)b; }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines