From 0de694c509edaf65aac76fe7d6e192754c4b6adc Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Thu, 21 Oct 2010 17:43:31 +0100
Subject: [PATCH] Avoid using #ifdef inside a function call that may itself
 actually be a macro.

A tweak to 20439bc77dfeec46. Hopefully this fixes the build on Win32.
---
 hv.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/hv.c b/hv.c
index d5dacab..08867cf 100644
--- a/hv.c
+++ b/hv.c
@@ -2988,12 +2988,16 @@ Perl_refcounted_he_new_pvn(pTHX_ struct refcounted_he *parent,
     if (!hash)
 	PERL_HASH(hash, keypv, keylen);
 
+#ifdef USE_ITHREADS
     he = (struct refcounted_he*)
 	PerlMemShared_malloc(sizeof(struct refcounted_he) - 1
-#ifdef USE_ITHREADS
 			     + keylen
-#endif
 			     + key_offset);
+#else
+    he = (struct refcounted_he*)
+	PerlMemShared_malloc(sizeof(struct refcounted_he) - 1
+			     + key_offset);
+#endif
 
     he->refcounted_he_next = parent;
 
-- 
2.7.4