Changeset 11297

Timestamp:

2006-03-01T17:03:49+13:00 (18 years ago)

Author:

jrm21

Message:

used is already taken on recent versions of freebsd (defined in
/usr/include/sys/cdefs.h) so renamed the mg one to bit_used.

File:

• trunk/gsdl/packages/mg/lib/bitio_m_random.h (modified) (6 diffs)

trunk/gsdl/packages/mg/lib/bitio_m_random.h

@@ -55 +55 @@
     register unsigned long __pos = 0;                   \
     register unsigned long __base = 0;                  \
-    register unsigned long __used = 0;                  \
+    register unsigned long __is_used = 0;                   \
     register unsigned long __len = (l)-1;               \
     register unsigned long __sft = 0;                   \
@@ -70 +70 @@
     register unsigned long __pos = (b).pos;             \
     register unsigned long __base = (b).Base;               \
-    register unsigned long __used = (b).Used;               \
+    register unsigned long __is_used = (b).Used;                \
     register unsigned long __len = (b).len;             \
     register unsigned long __sft = (b).sft;
@@ -76 +76 @@
 #define SEEK fprintf(stderr, "Seek to %d\n",__base)
 #define READ fprintf(stderr, "Read of %d\n",__len)
-#define WRITE fprintf(stderr, "Write of %d\n",__used)
+#define WRITE fprintf(stderr, "Write of %d\n",__is_used)
 
 #define WRITE_READ                          \
-    (__used ? (fseek(__file, __base, 0),                \
+    (__is_used ? (fseek(__file, __base, 0),             \
                    fwrite(__buf, 1, __len, __file)) : 0,        \
         __base += __len,                        \
     fseek(__file, __base, 0),                   \
         fread(__buf, 1, __len, __file),                 \
-    __pos = 0, __used = 0)
+    __pos = 0, __is_used = 0)
 
 #define ENCODE_BIT(b)                           \
@@ -92 +92 @@
     else                                \
       __buf[__pos>>3] &= 0xff7f >> (__pos&7);               \
-    __used = 1;                             \
+    __is_used = 1;                              \
     ++__pos;                                \
     if ((__pos>>3) >= __len)                        \
@@ -103 +103 @@
     (b).pos = __pos;                            \
     (b).Base = __base;                          \
-    (b).Used = __used;                          \
+    (b).Used = __is_used;                           \
     (b).len = __len;                            \
     (b).sft = __sft;                            \
@@ -109 +109 @@
 
 #define ENCODE_FLUSH                            \
-  if (__used)                               \
+  if (__is_used)                                \
     {                                   \
       fseek(__file, __base, 0);                     \
       fwrite(__buf, 1, __len, __file);                  \
-      __used = 0;                           \
+      __is_used = 0;                            \
     }