Changeset 34244

Timestamp:

Jul 31, 2012, 11:45:19 AM (14 years ago)

Author:

eugene

Message:

changes from trunk: adding mac cases to get OFF_T_FMT right (is there a better way)

Location:

branches/eam_branches/ipp-20120627/Ohana/src

Files:

• libohana/include/ohana.h (modified) (1 diff)
• opihi/cmd.astro (modified) (1 prop)

branches/eam_branches/ipp-20120627/Ohana/src/libohana/include/ohana.h

@@ -155 +155 @@
 /* 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
+#  define OFF_T_FMT "%jd"
+# endif
+
 # ifdef lin64
-# define OFF_T_FMT "%jd"
-# endif
-// # ifdef _DARWIN_C_SOURCE
-// # define OFF_T_FMT "%lld"
-// # endif
+#  define OFF_T_FMT "%jd"
+# endif
+
+// mac is annoying
+# ifdef _DARWIN_C_SOURCE
+#  define OFF_T_FMT "%lld"
+# endif
 # ifdef darwin_x86
-# define OFF_T_FMT "%lld"
-# endif
+#  define OFF_T_FMT "%lld"
+# endif
+# ifdef darwin
+#  define OFF_T_FMT "%lld"
+# endif
+
 // for mac os x 10.7 (lion): they don't use darwin, and i want to make sure it grabs for 10.7 and 64 bit (are they all 64 bit?)
 # if defined(__APPLE__) && defined(x86_64)
-# define OFF_T_FMT "%lld"
-# endif
+#  define OFF_T_FMT "%lld"
+# endif
+
 # ifndef OFF_T_FMT
-# define OFF_T_FMT "%ld"
+#  define OFF_T_FMT "%ld"
 # endif