diff options
| author | Vadim Konovalov <vkonovalov@lucent.com> | 2003-09-01 06:57:33 +0400 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2003-09-01 05:44:25 +0000 |
| commit | 94081db1137e9cdd123621b328739cc81d98c35e (patch) | |
| tree | 3ad357d4959fdf7d6dc9c831741618cda5dd883a /wince | |
| parent | feafb1eb594f32e8a3f987644204016d17007c35 (diff) | |
| download | perl-94081db1137e9cdd123621b328739cc81d98c35e.tar.gz | |
some WinCE compilers require a little correction
Message-ID: <1091134912500.20030901025733@peterstar.ru>
p4raw-id: //depot/perl@20978
Diffstat (limited to 'wince')
| -rw-r--r-- | wince/Makefile.ce | 10 | ||||
| -rw-r--r-- | wince/wince.c | 48 |
2 files changed, 11 insertions, 47 deletions
diff --git a/wince/Makefile.ce b/wince/Makefile.ce index 0092c6c39b..ca8db16c3e 100644 --- a/wince/Makefile.ce +++ b/wince/Makefile.ce @@ -761,9 +761,17 @@ $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs $(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 diff --git a/wince/wince.c b/wince/wince.c index 2d728f9065..40b578e755 100644 --- a/wince/wince.c +++ b/wince/wince.c @@ -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 @@ win32_crypt(const char *txt, const char *salt) #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 |