Re: [PATCH] Symbian port: add Series 90 support

Message-ID: <459CBC6A.4060806@iki.fi>

Fixes a VC7/VC7.1 linker error following #29650/#29651

p4raw-id: //depot/perl@29685

diff --git a/perl.h b/perl.h
index 85c205e..16ebc80 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -2066,12 +2066,6 @@ int isnan(double d);
 #   endif
 #endif
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1300) && (_MSC_VER < 1400) && (WINVER < 0x0500)
-/* VC7 or 7.1, building with pre-VC7 runtime libraries. */
-long _ftol( double ); /* Defined by VC6 C libs. */
-long _ftol2( double dblSource ) { return _ftol( dblSource ); }
-#endif
-
 /* The default is to use Perl's own atof() implementation (in numeric.c).
  * Usually that is the one to use but for some platforms (e.g. UNICOS)
  * it is however best to use the native implementation of atof.

diff --git a/util.c b/util.c
index 343ba5a..f67b3ba 100644 (file)
--- a/util.c
+++ b/util.c
@@ -5657,6 +5657,12 @@ Perl_my_strlcpy(char *dst, const char *src, Size_t size)
 }
 #endif
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1300) && (_MSC_VER < 1400) && (WINVER < 0x0500)
+/* VC7 or 7.1, building with pre-VC7 runtime libraries. */
+long _ftol( double ); /* Defined by VC6 C libs. */
+long _ftol2( double dblSource ) { return _ftol( dblSource ); }
+#endif
+
 void
 Perl_get_db_sub(pTHX_ SV **svp, CV *cv)
 {