diff options
| -rw-r--r-- | hints/os2.sh | 4 | ||||
| -rw-r--r-- | makedef.pl | 4 | ||||
| -rw-r--r-- | os2/Makefile.SHs | 2 | ||||
| -rwxr-xr-x | t/lib/glob-basic.t | 7 |
4 files changed, 12 insertions, 5 deletions
diff --git a/hints/os2.sh b/hints/os2.sh index 6eef5e37dc..0167a0ad5f 100644 --- a/hints/os2.sh +++ b/hints/os2.sh @@ -124,8 +124,8 @@ fi aout_ldflags="$aout_ldflags" aout_d_fork='define' -aout_ccflags='-DPERL_CORE -DDOSISH -DPERL_IS_AOUT -DOS2=2 -DEMBED -I.' -aout_cppflags='-DPERL_CORE -DDOSISH -DPERL_IS_AOUT -DOS2=2 -DEMBED -I.' +aout_ccflags='-DDOSISH -DPERL_IS_AOUT -DOS2=2 -DEMBED -I.' +aout_cppflags='-DDOSISH -DPERL_IS_AOUT -DOS2=2 -DEMBED -I.' aout_use_clib='c' aout_usedl='undef' aout_archobjs="os2.o dl_os2.o" diff --git a/makedef.pl b/makedef.pl index 7586f71bcf..d87029377d 100644 --- a/makedef.pl +++ b/makedef.pl @@ -259,6 +259,7 @@ threads_mutex nthreads nthreads_cond os2_cond_wait +os2_stat pthread_join pthread_create pthread_detach @@ -654,7 +655,8 @@ elsif ($PLATFORM eq 'os2') { /^\s*[\da-f:]+\s+(\w+)/i and $mapped{$1}++ foreach <MAP>; close MAP or die 'Cannot close miniperl.map'; - @missing = grep { !exists $mapped{$_} } keys %export; + @missing = grep { !exists $mapped{$_} and !exists $bincompat5005{$_} } + keys %export; delete $export{$_} foreach @missing; } diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs index f7f840258a..ba503ffbb3 100644 --- a/os2/Makefile.SHs +++ b/os2/Makefile.SHs @@ -20,7 +20,7 @@ PERL_FULLVERSION = $perl_fullversion OPTIMIZE = $optimize AOUT_OPTIMIZE = \$(OPTIMIZE) -AOUT_CCCMD = \$(CC) $aout_ccflags \$(AOUT_OPTIMIZE) +AOUT_CCCMD = \$(CC) -DPERL_CORE $aout_ccflags \$(AOUT_OPTIMIZE) AOUT_AR = $aout_ar AOUT_OBJ_EXT = $aout_obj_ext AOUT_LIB_EXT = $aout_lib_ext diff --git a/t/lib/glob-basic.t b/t/lib/glob-basic.t index 5189db458a..e3e53fe5e6 100755 --- a/t/lib/glob-basic.t +++ b/t/lib/glob-basic.t @@ -35,11 +35,15 @@ print "ok 2\n"; # look up the user's home directory # should return a list with one item, and not set ERROR if ($^O ne 'MSWin32') { + eval { ($name, $home) = (getpwuid($>))[0,7]; + 1; + } and do { @a = File::Glob::glob("~$name", GLOB_TILDE); if (scalar(@a) != 1 || $a[0] ne $home || GLOB_ERROR) { print "not "; } + }; } print "ok 3\n"; @@ -69,7 +73,8 @@ mkdir $dir, 0; @a = File::Glob::glob("$dir/*", GLOB_ERR); #print "\@a = ", array(@a); rmdir $dir; -if (scalar(@a) != 0 || ($^O ne 'MSWin32' && GLOB_ERROR == 0)) { +if (scalar(@a) != 0 || (($^O ne 'MSWin32' and $^O ne 'os2') + && GLOB_ERROR == 0)) { print "not "; } print "ok 6\n"; |