Changeset 42821 for trunk/Ohana/src/libohana/include/ohana.h

Timestamp:

May 8, 2025, 4:29:52 PM (14 months ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20230313

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libohana/include/ohana.h (modified) (1 diff)

trunk/Ohana/src/libohana/include/ohana.h

@@ -170 +170 @@
 
 /* if your build crashes on OFF_T_MODE, you probably need to add your 64bit hardware to this list */
-# ifdef _LARGEFILE_SOURCE
+# if defined(_LARGEFILE_SOURCE) && !defined(OFF_T_FMT)
 #  define OFF_T_FMT "%jd"
 # endif
 
-# ifdef lin64
+# if defined(lin64) && !defined(OFF_T_FMT)
 #  define OFF_T_FMT "%jd"
 # endif
 
 // mac is annoying
-# ifdef _DARWIN_C_SOURCE
+# if defined(_DARWIN_C_SOURCE) && !defined(OFF_T_FMT)
 #  define OFF_T_FMT "%lld"
 # endif
-# ifdef darwin_x86
+# if defined(darwin_x86) && !defined(OFF_T_FMT)
 #  define OFF_T_FMT "%lld"
 # endif
-# ifdef darwin
+# if defined(darwin) && !defined(OFF_T_FMT)
 #  define OFF_T_FMT "%lld"
 # endif