summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--pack.c12
2 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 077aafc..9f9143b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Apr 6 09:54:20 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * pack.c (NATINT_LEN): fix definition order, must be after
+ NATINT_PACK.
+
+Sat Apr 6 09:47:37 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * pack.c (NATINT_LEN): fix definition order, must be after
+ NATINT_PACK.
+
Sat Apr 6 03:11:07 2013 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/yaml_tree.rb: fix symbol keys in coder
diff --git a/pack.c b/pack.c
index aca562e..7a12cfc 100644
--- a/pack.c
+++ b/pack.c
@@ -36,12 +36,6 @@ static const char natstr[] = "sSiIlL";
#endif
static const char endstr[] = "sSiIlLqQ";
-#ifdef NATINT_PACK
-# define NATINT_LEN(type,len) (natint?(int)sizeof(type):(int)(len))
-#else
-# define NATINT_LEN(type,len) ((int)sizeof(type))
-#endif
-
#ifdef HAVE_TRUE_LONG_LONG
/* It is intentional to use long long instead of LONG_LONG. */
# define NATINT_LEN_Q NATINT_LEN(long long, 8)
@@ -75,6 +69,12 @@ static const char endstr[] = "sSiIlLqQ";
# define BIGENDIAN_P() 0
#endif
+#ifdef NATINT_PACK
+# define NATINT_LEN(type,len) (natint?(int)sizeof(type):(int)(len))
+#else
+# define NATINT_LEN(type,len) ((int)sizeof(type))
+#endif
+
#if SIZEOF_LONG == 8
# define INT64toNUM(x) LONG2NUM(x)
# define UINT64toNUM(x) ULONG2NUM(x)