summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2011-12-08 13:16:43 +0100
committerNicholas Clark <nick@ccl4.org>2011-12-09 16:49:48 +0100
commitc370e5423e76f589b72f910ca2e86b534fd93248 (patch)
tree1af4eae6841cb1ec94848f668db6b70abdce08a8
parentbce1a96b23c98bfb16c4770978518b5e69769b4f (diff)
downloadperl-c370e5423e76f589b72f910ca2e86b534fd93248.tar.gz
perl.h doesn't need special cases for x2p, as x2p doesn't include it.
Commit 22c35a8c2392967a in October 1998 added an #if !defined(PERL_FOR_X2P) guard to prevent perl.h from including embed.h when being used to compile a2p. However, this was not needed even then, because embed.h only contains pre-processor directives (mostly #define) related to tokens unused in a2p's C code, so its continued inclusion would not have any effect. Moreover a2p never actually included perl.h from its own code - only its copy of malloc.c would include perl.h, and that only if perl was configured to use its own malloc. But even x2p's use of malloc.c had been "temporarily disabled" by commit 30e2e4257067d5f8 1 month earlier, so there was never a need for this.
-rw-r--r--perl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl.h b/perl.h
index 30b8eb2b27..9514a191a8 100644
--- a/perl.h
+++ b/perl.h
@@ -977,7 +977,7 @@ EXTERN_C int usleep(unsigned int);
/* Cannot include embed.h here on Win32 as win32.h has not
yet been included and defines some config variables e.g. HAVE_INTERP_INTERN
*/
-#if !defined(PERL_FOR_X2P) && !(defined(WIN32)||defined(VMS))
+#if !(defined(WIN32)||defined(VMS))
# include "embed.h"
# ifndef PERL_MAD
# undef op_getmad