Fix dynamic loading (and argv[0]) under AmigaOS

[p5sagit/p5-mst-13.2.git] / perl.h

diff --git a/perl.h b/perl.h
index e86f930..f196eac 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -260,12 +260,6 @@
 
 #define MEM_SIZE Size_t
 
-#if _XOPEN_VERSION >= 4
-#   define Sock_size_t Size_t
-#else
-#   define Sock_size_t int
-#endif
-
 #if defined(STANDARD_C) && defined(I_STDDEF)
 #   include <stddef.h>
 #   define STRUCT_OFFSET(s,m)  offsetof(s,m)
@@ -989,18 +983,19 @@ union any {
     void       (*any_dptr) _((void*));
 };
 
+/* Work around some cygwin32 problems with importing global symbols */
+#if defined(CYGWIN32) && defined(DLLIMPORT) 
+#   include "cw32imp.h"
+#endif
+
 #include "regexp.h"
 #include "sv.h"
 #include "util.h"
 #include "form.h"
 #include "gv.h"
 #include "cv.h"
-#include "op.h"
-/* Work Around some problems with importing globals from dlls for cygwin32 */
-#if defined(CYGWIN32) && defined(DLLIMPORT) 
-#   include "extLibInc.h"
-#endif
 #include "opcode.h"
+#include "op.h"
 #include "cop.h"
 #include "av.h"
 #include "hv.h"
@@ -1847,9 +1842,9 @@ IEXT line_t       Icopline IINIT(NOLINE);
 IEXT CONTEXT * Icxstack;
 IEXT I32       Icxstack_ix IINIT(-1);
 IEXT I32       Icxstack_max IINIT(128);
-IEXT Sigjmp_buf        Itop_env;
+IEXT JMPENV    Istart_env;     /* empty startup sigjmp() environment */
+IEXT JMPENV *  Itop_env;       /* ptr. to current sigjmp() environment */
 IEXT I32       Irunlevel;
-IEXT bool      Imustcatch;     /* doeval() must be caught locally */
 
 /* stack stuff */
 IEXT AV *      Icurstack;              /* THE STACK */