uwsgi/uwsgi-2.0.18-psgi-fix-duplicate-uperl.patch

38 lines
988 B
Diff

diff --git a/plugins/psgi/psgi.h b/plugins/psgi/psgi.h
index 92e6b588..064041a2 100644
--- a/plugins/psgi/psgi.h
+++ b/plugins/psgi/psgi.h
@@ -87,3 +87,5 @@ void uwsgi_perl_exec(char *);
void uwsgi_perl_check_auto_reload(void);
void uwsgi_psgi_preinit_apps(void);
+
+extern struct uwsgi_perl uperl;
diff --git a/plugins/psgi/psgi_loader.c b/plugins/psgi/psgi_loader.c
index 1e61f0e9..a9211185 100644
--- a/plugins/psgi/psgi_loader.c
+++ b/plugins/psgi/psgi_loader.c
@@ -1,7 +1,6 @@
#include "psgi.h"
extern struct uwsgi_server uwsgi;
-struct uwsgi_perl uperl;
extern struct uwsgi_plugin psgi_plugin;
diff --git a/plugins/psgi/psgi_plugin.c b/plugins/psgi/psgi_plugin.c
index e1177be2..8ca0a2ed 100644
--- a/plugins/psgi/psgi_plugin.c
+++ b/plugins/psgi/psgi_plugin.c
@@ -3,11 +3,7 @@
extern char **environ;
extern struct uwsgi_server uwsgi;
-#ifdef __APPLE__
-extern struct uwsgi_perl uperl;
-#else
struct uwsgi_perl uperl;
-#endif
struct uwsgi_plugin psgi_plugin;