Changeset 4106

Timestamp:

Jun 3, 2005, 1:48:38 PM (21 years ago)

Author:

asc

Message:

workaround 4byte psBool endianness issue on Mac hardware.

Location:

trunk/psLib/src

Files:

• dataIO/psDB.c (modified) (3 diffs)
• db/psDB.c (modified) (3 diffs)

trunk/psLib/src/dataIO/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-28 01:01:32 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-03 23:48:38 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -23 +23 @@
 #include <stdarg.h>
 #include <string.h>
+#undef __STRICT_ANSI__
 #include <stdlib.h>
+#define __STRICT_ANSI__
 #include <math.h>
 #include <mysql.h>
@@ -807 +809 @@
                               : NULL;
         } else if (item->type == PS_TYPE_BOOL) {
+            // XXX: ASC HACK NOTE (2005/06/03): set extreme bytes to the
+            // boolean character value.  sizeof(psBool)==4 which triggers an
+            // endianess issue in the MySQL conversion (reading only 1 byte),
+            // on Macintosh hardware (and maybe others?)
+            unsigned int c  = (unsigned int)item->data.B;
+            item->data.S32  = (unsigned int)((c<<24) | c);
             bind[i].length  = 0;
             bind[i].buffer  = &item->data.B;

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-28 01:01:32 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-03 23:48:38 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -23 +23 @@
 #include <stdarg.h>
 #include <string.h>
+#undef __STRICT_ANSI__
 #include <stdlib.h>
+#define __STRICT_ANSI__
 #include <math.h>
 #include <mysql.h>
@@ -807 +809 @@
                               : NULL;
         } else if (item->type == PS_TYPE_BOOL) {
+            // XXX: ASC HACK NOTE (2005/06/03): set extreme bytes to the
+            // boolean character value.  sizeof(psBool)==4 which triggers an
+            // endianess issue in the MySQL conversion (reading only 1 byte),
+            // on Macintosh hardware (and maybe others?)
+            unsigned int c  = (unsigned int)item->data.B;
+            item->data.S32  = (unsigned int)((c<<24) | c);
             bind[i].length  = 0;
             bind[i].buffer  = &item->data.B;