This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
perl.h doesn't need special cases for x2p, as x2p doesn't include it.
authorNicholas Clark <nick@ccl4.org>
Thu, 8 Dec 2011 12:16:43 +0000 (13:16 +0100)
committerNicholas Clark <nick@ccl4.org>
Fri, 9 Dec 2011 15:49:48 +0000 (16:49 +0100)
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.

perl.h

diff --git a/perl.h b/perl.h
index 30b8eb2..9514a19 100644 (file)
--- 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