Changeset 28235

Timestamp:

Jun 6, 2010, 2:46:21 PM (16 years ago)

Author:

eugene

Message:

move byte_swap test to ohana.h; add OFF_T_FMT; add required test for NAN and BYTE_SWAP validity

Location:

branches/eam_branches/Ohana.20100606/src/libohana

Files:

• Makefile (modified) (3 diffs)
• include/ohana.h (modified) (2 diffs)
• test/typetest.c (added)

branches/eam_branches/Ohana.20100606/src/libohana/Makefile

@@ -1 +1 @@
 default: install
 help:
-        @echo "make options: install libohana clean dist"
+        @echo "make options: install libohana clean dist test typetest"
 
 include ../../Makefile.System
@@ -19 +19 @@
 TFLAGS        = $(FULL_CFLAGS) $(FULL_CPPFLAGS) $(FULL_LDFLAGS) -lohana -ltap_ohana
 
-install: $(DESTLIB)/libohana.a $(DESTLIB)/libohana.$(DLLTYPE)
+install: $(DESTLIB)/libohana.a $(DESTLIB)/libohana.$(DLLTYPE) typetest
 libohana: $(LIB)/libohana.$(ARCH).a $(LIB)/libohana.$(ARCH).$(DLLTYPE)
 
@@ -40 +40 @@
 $(SRC)/CommOps.$(ARCH).o         \
 $(SRC)/version.$(ARCH).o
+
+TYPETEST = \
+$(TESTDIR)/typetest.$(ARCH)
+
+$(TYPETEST) : $(LIB)/libohana.$(ARCH).a
+
+typetest: $(TYPETEST)
+        for i in $(TYPETEST); do $$i || exit 1; done
 
 TEST = \

branches/eam_branches/Ohana.20100606/src/libohana/include/ohana.h

@@ -94 +94 @@
 };
 
+/* note: in the Ohana tree, the byte order is determined by the ARCH variable
+   if you have a small endian machine that is not listed here, the test
+   program 'typestest' should fail */
+# ifndef BYTE_SWAP
+# ifdef linux
+# define BYTE_SWAP
+# endif
+
+# ifdef lin64
+# define BYTE_SWAP
+# endif
+
+# ifdef sid
+# define BYTE_SWAP
+# endif
+
+# ifdef darwin_x86
+# define BYTE_SWAP
+# endif
+
+# ifdef dec
+# define BYTE_SWAP
+# endif
+# else
+# define NOT_BYTE_SWAP
+# endif /* BYTE_SWAP */
+
 # ifndef NAN
 # ifndef BYTE_SWAP
@@ -103 +130 @@
     __attribute_used__ = { __nan_bytes };
 # define NAN    (__nan_union.__d)
+# endif
+
+/* if your build crashes on OFF_T_MODE, you probably need to add your 64bit hardware to this list */
+# ifdef _LARGEFILE_SOURCE
+# define OFF_T_FMT "%jd"
+# endif
+# ifdef lin64
+# define OFF_T_FMT "%jd"
+# endif
+# ifndef OFF_T_FMT
+# define OFF_T_FMT "%ld"
+# endif
+
+# ifndef isfinite
+# define isfinite(A) (!isnan(A))
 # endif