Change 30284 by [EMAIL PROTECTED] on 2007/02/14 13:46:26
Restore differences in maint that change 30282 removed.
(It seemed cleaner to do it this way, rather than as part of the
integration)
Affected files ...
... //depot/maint-5.8/perl/win32/Makefile.ce#4 edit
... //depot/maint-5.8/perl/win32/config.ce#2 edit
... //depot/maint-5.8/perl/win32/wince.c#2 edit
... //depot/maint-5.8/perl/win32/wincesck.c#2 edit
Differences ...
==== //depot/maint-5.8/perl/win32/Makefile.ce#4 (text) ====
Index: perl/win32/Makefile.ce
--- perl/win32/Makefile.ce#3~30283~ 2007-02-14 05:43:15.000000000 -0800
+++ perl/win32/Makefile.ce 2007-02-14 05:46:26.000000000 -0800
@@ -3,8 +3,8 @@
# Time-stamp: <26/10/01 15:10:06 [EMAIL PROTECTED]>
SRCDIR = ..
-PV = 59
-INST_VER = 5.9.4
+PV = 58
+INST_VER = 5.8.8
# INSTALL_ROOT specifies a path where this perl will be installed on CE device
INSTALL_ROOT=/netzwerk/sprache/perl
@@ -394,6 +394,14 @@
PERL_MALLOC = undef
!ENDIF
+!IF "$(USE_5005THREADS)" == ""
+USE_5005THREADS = undef
+!ENDIF
+
+!IF "$(USE_5005THREADS)" == "define"
+USE_ITHREADS = undef
+!ENDIF
+
!IF "$(USE_MULTI)" == ""
USE_MULTI = undef
!ENDIF
@@ -414,15 +422,16 @@
USE_PERLCRT = undef
!ENDIF
-!IF "$(USE_IMP_SYS)$(USE_MULTI)" == "defineundef"
+!IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)" == "defineundefundef"
USE_MULTI = define
!ENDIF
!IF "$(USE_ITHREADS)$(USE_MULTI)" == "defineundef"
USE_MULTI = define
+USE_5005THREADS = undef
!ENDIF
-!IF "$(USE_MULTI)" != "undef"
+!IF "$(USE_MULTI)$(USE_5005THREADS)" != "undefundef"
BUILDOPT = $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
!ENDIF
@@ -718,7 +727,9 @@
"make=nmake" \
"static_ext=$(STATIC_EXT)" \
"dynamic_ext=$(DYNAMIC_EXT)" \
+ "use5005threads=$(USE_5005THREADS)" \
"useithreads=$(USE_ITHREADS)" \
+ "usethreads=$(USE_5005THREADS)" \
"usemultiplicity=$(USE_MULTI)" \
"useperlio=$(USE_PERLIO)" \
"LINK_FLAGS=$(LDLIBPATH) $(LINK_FLAGS) $(SUBSYS)" \
==== //depot/maint-5.8/perl/win32/config.ce#2 (text) ====
Index: perl/win32/config.ce
--- perl/win32/config.ce#1~30282~ 2007-02-14 05:38:24.000000000 -0800
+++ perl/win32/config.ce 2007-02-14 05:46:26.000000000 -0800
@@ -926,7 +926,7 @@
use64bitint='undef'
usecrosscompile='undef'
usedl='define'
-usefaststdio='undef'
+usefaststdio='define'
useithreads='~USE_ITHREADS~'
uselargefiles='undef'
uselongdouble='undef'
==== //depot/maint-5.8/perl/win32/wince.c#2 (text) ====
Index: perl/win32/wince.c
--- perl/win32/wince.c#1~30282~ 2007-02-14 05:38:24.000000000 -0800
+++ perl/win32/wince.c 2007-02-14 05:46:26.000000000 -0800
@@ -354,7 +354,7 @@
* the library functions will get the correct environment
*/
PerlIO *
-Perl_my_popen(pTHX_ const char *cmd, const char *mode)
+Perl_my_popen(pTHX_ char *cmd, char *mode)
{
printf("popen(%s)\n", cmd);
@@ -629,7 +629,7 @@
}
bool
-Perl_do_exec(pTHX_ const char *cmd)
+Perl_do_exec(pTHX_ char *cmd)
{
do_spawn2(aTHX_ cmd, EXECF_EXEC);
return FALSE;
@@ -640,7 +640,7 @@
* return the pointer to the current file name.
*/
DllExport DIR *
-win32_opendir(const char *filename)
+win32_opendir(char *filename)
{
dTHX;
DIR *dirp;
@@ -819,7 +819,7 @@
/////!!!!!!!!!!! return here and do right stuff!!!!
DllExport DIR *
-win32_opendir(const char *filename)
+win32_opendir(char *filename)
{
return opendir(filename);
}
@@ -2660,7 +2660,6 @@
DllExport void
Perl_win32_term(void)
{
- HINTS_REFCNT_TERM;
OP_REFCNT_TERM;
MALLOC_TERM;
}
==== //depot/maint-5.8/perl/win32/wincesck.c#2 (text) ====
Index: perl/win32/wincesck.c
--- perl/win32/wincesck.c#1~30282~ 2007-02-14 05:38:24.000000000 -0800
+++ perl/win32/wincesck.c 2007-02-14 05:46:26.000000000 -0800
@@ -57,6 +57,14 @@
#define TO_SOCKET(X) (X)
+#ifdef USE_5005THREADS
+#define StartSockets() \
+ STMT_START { \
+ if (!wsock_started) \
+ start_sockets(); \
+ set_socktype(); \
+ } STMT_END
+#else
#define StartSockets() \
STMT_START { \
if (!wsock_started) { \
@@ -64,6 +72,7 @@
set_socktype(); \
} \
} STMT_END
+#endif
#define SOCKET_TEST(x, y) \
STMT_START { \
End of Patch.
