Change 20978 by [EMAIL PROTECTED] on 2003/09/01 05:44:25
Subject: [EMAIL PROTECTED] some WinCE compilers require a little correction
From: Vadim Konovalov <[EMAIL PROTECTED]>
Date: Mon, 1 Sep 2003 02:57:33 +0400
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/wince/Makefile.ce#31 edit
... //depot/perl/wince/wince.c#16 edit
Differences ...
==== //depot/perl/wince/Makefile.ce#31 (text) ====
Index: perl/wince/Makefile.ce
--- perl/wince/Makefile.ce#30~20500~ Tue Aug 5 08:14:35 2003
+++ perl/wince/Makefile.ce Sun Aug 31 22:44:25 2003
@@ -761,9 +761,17 @@
$(COPY) dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs
#----------------------------------------------------------------------------------
+NOT_COMPILE_EXT =
+!if "$(MACHINE)" == "wince-sh3-palm-wce211"
+NOT_COMPILE_EXT = $(NOT_COMPILE_EXT) !XS/Typemap
+!endif
+!if "$(MACHINE)" == "wince-mips-palm-wce211"
+NOT_COMPILE_EXT = $(NOT_COMPILE_EXT) !XS/Typemap
+!endif
+
Extensions: ..\win32\buildext.pl $(PERLDEP) $(CONFIGPM)
$(HPERL) -I..\lib -I..\win32 -MCross=$(CROSS_NAME) ..\win32\buildext.pl
$(MAKE) $(PERLDEP) $(EXTDIR) \
- !POSIX
+ !POSIX $(NOT_COMPILE_EXT)
Extensions_clean:
-if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP)
$(EXTDIR) clean
==== //depot/perl/wince/wince.c#16 (text) ====
Index: perl/wince/wince.c
--- perl/wince/wince.c#15~20500~ Tue Aug 5 08:14:35 2003
+++ perl/wince/wince.c Sun Aug 31 22:44:25 2003
@@ -41,6 +41,8 @@
#include "cewin32_defs.h"
#include "cecrt_defs.h"
+#define GetCurrentDirectoryW XCEGetCurrentDirectoryW
+
#ifdef PALM_SIZE
#include "stdio-palmsize.h"
#endif
@@ -1253,52 +1255,6 @@
#endif
}
-/* C doesn't like repeat struct definitions */
-
-#if defined(USE_FIXED_OSFHANDLE) || defined(PERL_MSVCRT_READFIX)
-
-#ifndef _CRTIMP
-#define _CRTIMP __declspec(dllimport)
-#endif
-
-/*
- * Control structure for lowio file handles
- */
-typedef struct {
- long osfhnd; /* underlying OS file HANDLE */
- char osfile; /* attributes of file (e.g., open in text mode?) */
- char pipech; /* one char buffer for handles opened on pipes */
- int lockinitflag;
- CRITICAL_SECTION lock;
-} ioinfo;
-
-
-/*
- * Array of arrays of control structures for lowio files.
- */
-EXTERN_C _CRTIMP ioinfo* __pioinfo[];
-
-/*
- * Definition of IOINFO_L2E, the log base 2 of the number of elements in each
- * array of ioinfo structs.
- */
-#define IOINFO_L2E 5
-
-/*
- * Definition of IOINFO_ARRAY_ELTS, the number of elements in ioinfo array
- */
-#define IOINFO_ARRAY_ELTS (1 << IOINFO_L2E)
-
-/*
- * Access macros for getting at an ioinfo struct and its fields from a
- * file handle
- */
-#define _pioinfo(i) (__pioinfo[(i) >> IOINFO_L2E] + ((i) & (IOINFO_ARRAY_ELTS - 1)))
-#define _osfhnd(i) (_pioinfo(i)->osfhnd)
-#define _osfile(i) (_pioinfo(i)->osfile)
-#define _pipech(i) (_pioinfo(i)->pipech)
-
-#endif
/*
* redirected io subsystem for all XS modules
End of Patch.
