[asperl] added AS patch#8

p4raw-id: //depot/asperl@587

diff --git a/sv.c b/sv.c
index a4d72bc..a31f41d 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -65,8 +65,6 @@ static void sv_mortalgrow _((void));
 static void sv_unglob _((SV* sv));
 static void sv_check_thinkfirst _((SV *sv));
 
-#define SV_CHECK_THINKFIRST(sv) if (SvTHINKFIRST(sv)) sv_check_thinkfirst(sv)
-
 #ifndef PURIFY
 static void *my_safemalloc(MEM_SIZE size);
 #endif
@@ -77,6 +75,8 @@ typedef void (*SVFUNC) _((SV*));
 
 #endif /* PERL_OBJECT */
 
+#define SV_CHECK_THINKFIRST(sv) if (SvTHINKFIRST(sv)) sv_check_thinkfirst(sv)
+
 #ifdef PURIFY
 
 #define new_SV(p)                      \

diff --git a/x2p/a2py.c b/x2p/a2py.c
index fefa81d..a4753ab 100644 (file)
--- a/x2p/a2py.c
+++ b/x2p/a2py.c
@@ -9,6 +9,9 @@
  */
 
 #if defined(OS2) || defined(WIN32)
+#if defined(WIN32)
+#include <io.h>
+#endif
 #include "../patchlevel.h"
 #endif
 #include "util.h"

diff --git a/x2p/util.c b/x2p/util.c
index 3d3b99a..e2b8bba 100644 (file)
--- a/x2p/util.c
+++ b/x2p/util.c
@@ -42,6 +42,7 @@ safemalloc(size_t size)
        exit(1);
     }
     /*NOTREACHED*/
+    return 0;
 }
 
 /* paranoid version of realloc */
@@ -66,6 +67,7 @@ saferealloc(void *where, size_t size)
        exit(1);
     }
     /*NOTREACHED*/
+    return 0;
 }
 
 /* safe version of free */