diff options
| author | Tony Cook <tony@develop-help.com> | 2016-05-16 16:51:51 +1000 |
|---|---|---|
| committer | Tony Cook <tony@develop-help.com> | 2017-01-19 11:10:59 +1100 |
| commit | 564894eac8e9ca301638cfa07ae8791b6132f146 (patch) | |
| tree | 626b94ee2fa2f30aae93f255771bdfd453b78007 | |
| parent | fc408859b7454742bb5eff25287a44d5d1256f78 (diff) | |
| download | perl-564894eac8e9ca301638cfa07ae8791b6132f146.tar.gz | |
(perl #126228) partly revert 8cc95fdb and fix a3c8358c
a3c8358c changed:
-#define dXSUB_SYS int dummy
+#define dXSUB_SYS
which made dXSUB_SYS into not-a-declaration, this apparently broke
something, since 8cc95fdb then went through all the definitions of
dXSUB_SYS, made each of them into not-a-declaration and then
ensured ExtUtilis::Miniperl emitted dXSUB_SYS in a place where it
didn't matter whether it was a declaration or a statement.
When these changes were made perl.h didn't have dNOOP, but now we
do, so we can make dXSUB_SYS a declaration again, as its name
implies.
Based on a patch originally created by Daniel Dragan (bulk88).
| -rw-r--r-- | dosish.h | 2 | ||||
| -rw-r--r-- | os2/os2ish.h | 2 | ||||
| -rw-r--r-- | plan9/plan9ish.h | 2 | ||||
| -rw-r--r-- | symbian/symbianish.h | 2 | ||||
| -rw-r--r-- | unixish.h | 2 | ||||
| -rw-r--r-- | vms/vmsish.h | 2 |
6 files changed, 6 insertions, 6 deletions
@@ -56,7 +56,7 @@ HINTS_REFCNT_TERM; OP_CHECK_MUTEX_TERM; \ OP_REFCNT_TERM; PERLIO_TERM; MALLOC_TERM; LOCALE_TERM; #endif -#define dXSUB_SYS +#define dXSUB_SYS dNOOP /* USEMYBINMODE * This symbol, if defined, indicates that the program should diff --git a/os2/os2ish.h b/os2/os2ish.h index 70c8cbecf9..fb71cd0fd9 100644 --- a/os2/os2ish.h +++ b/os2/os2ish.h @@ -274,7 +274,7 @@ void Perl_OS2_term(void **excH, int exitstatus, int flags); /* #define PERL_SYS_TERM_BODY() STMT_START { \ if (Perl_HAB_set) WinTerminate(Perl_hab); } STMT_END */ -#define dXSUB_SYS OS2_XS_init() +#define dXSUB_SYS int fake = OS2_XS_init() PERL_UNUSED_DECL #ifdef PERL_IS_AOUT /* # define HAS_FORK */ diff --git a/plan9/plan9ish.h b/plan9/plan9ish.h index 0fdce125be..5c326f674b 100644 --- a/plan9/plan9ish.h +++ b/plan9/plan9ish.h @@ -106,7 +106,7 @@ #define BIT_BUCKET "/dev/null" #define PERL_SYS_INIT_BODY(c,v) \ MALLOC_CHECK_TAINT2(*c,*v) PERLIO_INIT; MALLOC_INIT -#define dXSUB_SYS +#define dXSUB_SYS dNOOP #define PERL_SYS_TERM_BODY() PERLIO_TERM; MALLOC_TERM /* diff --git a/symbian/symbianish.h b/symbian/symbianish.h index 80c580b16a..9100405bfb 100644 --- a/symbian/symbianish.h +++ b/symbian/symbianish.h @@ -128,7 +128,7 @@ #define BIT_BUCKET "NUL:" -#define dXSUB_SYS +#define dXSUB_SYS dNOOP #define NO_ENVIRON_ARRAY @@ -159,7 +159,7 @@ int afstat(int fd, struct stat *statb); #define BIT_BUCKET "/dev/null" -#define dXSUB_SYS +#define dXSUB_SYS dNOOP #ifndef NO_ENVIRON_ARRAY #define USE_ENVIRON_ARRAY diff --git a/vms/vmsish.h b/vms/vmsish.h index 1aea82944c..5011590157 100644 --- a/vms/vmsish.h +++ b/vms/vmsish.h @@ -317,7 +317,7 @@ struct interp_intern { #define PERL_SYS_INIT_BODY(c,v) MALLOC_CHECK_TAINT2(*c,*v) vms_image_init((c),(v)); PERLIO_INIT; MALLOC_INIT #define PERL_SYS_TERM_BODY() HINTS_REFCNT_TERM; OP_REFCNT_TERM; \ PERLIO_TERM; MALLOC_TERM; LOCALE_TERM -#define dXSUB_SYS +#define dXSUB_SYS dNOOP #define HAS_KILL #define HAS_WAIT |