summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorDagfinn Ilmari Mannsåker <ilmari@ilmari.org>2020-03-20 21:15:43 +0000
committerDagfinn Ilmari Mannsåker <ilmari@ilmari.org>2020-07-20 23:28:12 +0100
commit8c3a0f6ca6a8f3a02c3394507eb4284c1017dba1 (patch)
treeaaa777b26aeec48b155ff5b6465bdf8be109d7d4 /win32
parent822c8b4dc3fe62cd97d78e693e5871fcc65782fd (diff)
downloadperl-8c3a0f6ca6a8f3a02c3394507eb4284c1017dba1.tar.gz
Remove PERL_GLOBAL_STRUCT
This was originally added for MinGW, which no longer needs it, and only still used by Symbian, which is now removed. This also leaves perlapi.[ch] empty, but we keep the header for CPAN backwards compatibility.
Diffstat (limited to 'win32')
-rw-r--r--win32/GNUmakefile1
-rw-r--r--win32/Makefile1
-rw-r--r--win32/makefile.mk1
-rw-r--r--win32/perllib.c12
-rw-r--r--win32/win32.h5
5 files changed, 0 insertions, 20 deletions
diff --git a/win32/GNUmakefile b/win32/GNUmakefile
index 193fdf71ce..a2578dd8e9 100644
--- a/win32/GNUmakefile
+++ b/win32/GNUmakefile
@@ -1065,7 +1065,6 @@ MICROCORE_SRC = \
..\mg.c \
..\numeric.c \
..\pad.c \
- ..\perlapi.c \
..\perly.c \
..\pp_sort.c \
..\reentr.c \
diff --git a/win32/Makefile b/win32/Makefile
index 42a0bef4fe..7598a90bdd 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -774,7 +774,6 @@ MICROCORE_SRC = \
..\op.c \
..\pad.c \
..\perl.c \
- ..\perlapi.c \
..\perly.c \
..\pp.c \
..\pp_ctl.c \
diff --git a/win32/makefile.mk b/win32/makefile.mk
index abdc674e34..67c90347f0 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1017,7 +1017,6 @@ MICROCORE_SRC = \
..\mg.c \
..\numeric.c \
..\pad.c \
- ..\perlapi.c \
..\perly.c \
..\pp_sort.c \
..\reentr.c \
diff --git a/win32/perllib.c b/win32/perllib.c
index 755477c63a..9948a1a3ba 100644
--- a/win32/perllib.c
+++ b/win32/perllib.c
@@ -175,18 +175,6 @@ RunPerl(int argc, char **argv, char **env)
PerlInterpreter *my_perl, *new_perl = NULL;
bool use_environ = (env == environ);
-#ifdef PERL_GLOBAL_STRUCT
-#define PERLVAR(prefix,var,type) /**/
-#define PERLVARA(prefix,var,type) /**/
-#define PERLVARI(prefix,var,type,init) PL_Vars.prefix##var = init;
-#define PERLVARIC(prefix,var,type,init) PL_Vars.prefix##var = init;
-#include "perlvars.h"
-#undef PERLVAR
-#undef PERLVARA
-#undef PERLVARI
-#undef PERLVARIC
-#endif
-
PERL_SYS_INIT(&argc,&argv);
if (!(my_perl = perl_alloc()))
diff --git a/win32/win32.h b/win32/win32.h
index c0ee5a6e92..00d052ac9c 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -60,9 +60,6 @@
# define prime_env_iter()
# define WIN32IO_IS_STDIO /* don't pull in custom stdio layer */
# define WIN32SCK_IS_STDSCK /* don't pull in custom wsock layer */
-# ifdef PERL_GLOBAL_STRUCT
-# error PERL_GLOBAL_STRUCT cannot be defined with PERL_IMPLICIT_SYS
-# endif
#endif
#ifdef __GNUC__
@@ -231,8 +228,6 @@ struct utsname {
# define WIN32_NO_REGISTRY_M_(x) x,
#endif
-#define PERL_NO_FORCE_LINK /* no need for PL_force_link_funcs */
-
#define ENV_IS_CASELESS
#define PIPESOCK_MODE "b" /* pipes, sockets default to binmode */