summaryrefslogtreecommitdiff
path: root/handy.h
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2000-11-15 22:51:56 +0000
committerJarkko Hietaniemi <jhi@iki.fi>2000-11-15 22:51:56 +0000
commit69512466eac565d46d842d1928d659aa3c3c249b (patch)
tree9792f0d158579a5b94e391cec733ed7c2eb74ab9 /handy.h
parentc3dedce1d22d7ae69fe05f4e0ca7db15ffadf602 (diff)
downloadperl-69512466eac565d46d842d1928d659aa3c3c249b.tar.gz
UINT64_C() work continues.
p4raw-id: //depot/perl@7700
Diffstat (limited to 'handy.h')
-rw-r--r--handy.h31
1 files changed, 18 insertions, 13 deletions
diff --git a/handy.h b/handy.h
index ba3a812756..b3912a4483 100644
--- a/handy.h
+++ b/handy.h
@@ -114,6 +114,10 @@ Null SV pointer.
*/
+#ifdef I_INTTYPES /* e.g. Linux has int64_t without <inttypes.h> */
+# include <inttypes.h>
+#endif
+
typedef I8TYPE I8;
typedef U8TYPE U8;
typedef I16TYPE I16;
@@ -122,24 +126,25 @@ typedef I32TYPE I32;
typedef U32TYPE U32;
#ifdef PERL_CORE
# ifdef HAS_QUAD
-# if QUADKIND == QUAD_IS_INT64_T
-# include <sys/types.h>
-# ifdef I_INTTYPES /* e.g. Linux has int64_t without <inttypes.h> */
-# include <inttypes.h>
-# endif
-# endif
typedef I64TYPE I64;
typedef U64TYPE U64;
# endif
#endif /* PERL_CORE */
-#ifndef UINT64_C /* usually from <inttypes.h> */
-# ifdef HAS_LONG_LONG
-# define INT64_C(c) CAT2(c,LL)
-# define UINT64_C(c) CAT2(c,ULL)
-# else
-# define INT64_C(c) ((I64TYPE)(c))
-# define UINT64_C(c) ((U64TYPE)(c))
+#if defined(HAS_QUAD) && defined(USE_64_BIT_INT)
+# ifndef UINT64_C /* usually from <inttypes.h> */
+# if defined(HAS_LONG_LONG) && QUADKIND == QUAD_IS_LONG_LONG
+# define INT64_C(c) CAT2(c,LL)
+# define UINT64_C(c) CAT2(c,ULL)
+# else
+# if LONGSIZE == 8 && QUADKIND == QUAD_IS_LONG
+# define INT64_C(c) CAT2(c,L)
+# define UINT64_C(c) CAT2(c,UL)
+# else
+# define INT64_C(c) ((I64TYPE)(c))
+# define UINT64_C(c) ((U64TYPE)(c))
+# endif
+# endif
# endif
#endif