diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-02-25 21:46:35 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-02-25 21:46:35 +0000 |
| commit | f1c0db8dbc906cad6c85874be33c7969497df1cd (patch) | |
| tree | 47bb35826b88df8a906e9799c987f87a91563f6f /ext | |
| parent | 51c1089b32b9be8d5242f51a530e4b3118896e71 (diff) | |
| parent | 33b839e22819d9ddfd0fa565289e5af7b6262ec9 (diff) | |
| download | perl-f1c0db8dbc906cad6c85874be33c7969497df1cd.tar.gz | |
[win32] integrate mainline
p4raw-id: //depot/win32/perl@588
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/B/B/Asmdata.pm | 2 | ||||
| -rw-r--r-- | ext/DB_File/DB_File.xs | 8 | ||||
| -rw-r--r-- | ext/POSIX/POSIX.xs | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/ext/B/B/Asmdata.pm b/ext/B/B/Asmdata.pm index 3a3cf6da61..b1df379009 100644 --- a/ext/B/B/Asmdata.pm +++ b/ext/B/B/Asmdata.pm @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 1997 Malcolm Beattie +# Copyright (c) 1996-1998 Malcolm Beattie # # You may distribute under the terms of either the GNU General Public # License or the Artistic License, as specified in the README file. diff --git a/ext/DB_File/DB_File.xs b/ext/DB_File/DB_File.xs index b6da38609d..91b4dc2ad5 100644 --- a/ext/DB_File/DB_File.xs +++ b/ext/DB_File/DB_File.xs @@ -533,14 +533,6 @@ DB_File db ; DBT_flags(key) ; DBT_flags(value) ; RETVAL = do_SEQ(db, key, value, R_LAST) ; - if (RETVAL < 0 && errno == EBADF) - { - recno_t oops = -1; - key.data = &oops; - key.size = sizeof(oops); - db_get(db, key, value, 0); - RETVAL = do_SEQ(db, key, value, R_LAST) ; - } if (RETVAL == 0) RETVAL = *(I32 *)key.data ; else /* No key means empty file */ diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs index d3714557ec..31439b2365 100644 --- a/ext/POSIX/POSIX.xs +++ b/ext/POSIX/POSIX.xs @@ -247,6 +247,12 @@ char *tzname[] = { "" , "" }; * support is added and NETaa14816 is considered in full. * It does not address tzname aspects of NETaa14816. */ +#ifdef HAS_GNULIBC +# ifndef STRUCT_TM_HASZONE +# define STRUCT_TM_HAS_ZONE +# endif +#endif + #ifdef STRUCT_TM_HASZONE static void init_tm(ptm) /* see mktime, strftime and asctime */ |