summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes120
-rw-r--r--win32/win32.c6
-rw-r--r--win32/win32.h2
3 files changed, 122 insertions, 6 deletions
diff --git a/Changes b/Changes
index 6060b49716..0c3c4ab831 100644
--- a/Changes
+++ b/Changes
@@ -79,6 +79,126 @@ Version 5.005_58 Development release working toward 5.006
----------------
____________________________________________________________________________
+[ 3565] By: gsar on 1999/07/04 01:26:02
+ Log: newer version of perlxstut from Jeff Okamoto (slightly edited
+ for win32 issues)
+ Branch: perl
+ ! pod/perlxstut.pod
+____________________________________________________________________________
+[ 3564] By: gsar on 1999/07/02 03:09:04
+ Log: avoid warnings
+ Branch: perl
+ ! ext/Thread/Thread/Specific.pm lib/fields.pm
+____________________________________________________________________________
+[ 3563] By: gsar on 1999/06/28 19:23:47
+ Log: inc version (for CPAN.pm sanity)
+ Branch: perl
+ ! lib/Text/ParseWords.pm
+____________________________________________________________________________
+[ 3562] By: gsar on 1999/06/28 19:19:01
+ Log: regen perltoc
+ Branch: perl
+ ! pod/perltoc.pod
+____________________________________________________________________________
+[ 3561] By: gsar on 1999/06/28 19:08:41
+ Log: From: Damian Conway <damian@cs.monash.edu.au>
+ Date: Wed, 26 May 1999 00:58:35 -0400
+ Message-Id: <199905260458.AAA06411@defender.perl.org>
+ Subject: [19990526.002] Misc. improvements to Class:Struct
+ Branch: perl
+ ! MANIFEST lib/Class/Struct.pm
+____________________________________________________________________________
+[ 3560] By: gsar on 1999/06/28 18:50:52
+ Log: remove bogus PL_optype_size
+ Branch: perl
+ ! bytecode.pl ext/ByteLoader/byterun.h
+____________________________________________________________________________
+[ 3559] By: gsar on 1999/06/28 18:22:26
+ Log: upgrade CGI.pm to v2.53 (CGI/{Apache,Switch}.pm NOT deleted)
+ Branch: perl
+ + lib/CGI/Pretty.pm
+ ! eg/cgi/file_upload.cgi lib/CGI.pm lib/CGI/Carp.pm
+ ! lib/CGI/Cookie.pm lib/CGI/Fast.pm t/lib/cgi-form.t
+ ! t/lib/cgi-html.t t/lib/cgi-request.t
+____________________________________________________________________________
+[ 3558] By: jhi on 1999/06/28 07:30:21
+ Log: Change Olaf Lebbe's email address.
+ Branch: cfgperl
+ ! README.epoc
+____________________________________________________________________________
+[ 3557] By: gsar on 1999/06/28 00:07:33
+ Log: make autogenerated files writable
+ Branch: perl
+ - win32/perlhost.h
+ ! MANIFEST Porting/makerel embed.h embedvar.h ext/B/B/Asmdata.pm
+ ! ext/ByteLoader/byterun.c ext/ByteLoader/byterun.h global.sym
+ ! keywords.h lib/warning.pm objXSUB.h opcode.h pp.sym pp_proto.h
+ ! proto.h regnodes.h warning.h win32/config_H.bc
+ ! win32/config_H.gc win32/config_H.vc
+____________________________________________________________________________
+[ 3556] By: jhi on 1999/06/27 19:22:53
+ Log: Update MANIFEST to match #3555.
+ Branch: cfgperl
+ ! MANIFEST
+____________________________________________________________________________
+[ 3555] By: jhi on 1999/06/27 19:16:22
+ Log: EPOC port to Psion5.
+ From: Olaf Flebbe <O.Flebbe@science-computing.de>
+ To: Jarkko Hietaniemi <jhi@iki.fi>
+ Cc: perl5-porters@perl.org
+ Subject: Re: Psion5
+ Date: Sun, 27 Jun 1999 20:50:30 +0200 (METDST)
+ Message-ID: <Pine.GHP.4.02.9906272048130.17736-100000@io.science-computing.de>
+ Branch: cfgperl
+ + README.epoc epoc/config.h epoc/epoc.c epoc/epocish.h
+ + epoc/perl.mmp epoc/perl.pkg
+ ! MANIFEST doio.c lib/Term/ReadLine.pm lib/perl5db.pl perl.c
+ ! perl.h sv.c util.c
+____________________________________________________________________________
+[ 3554] By: jhi on 1999/06/27 18:50:52
+ Log: Integrate from mainperl.
+ Branch: cfgperl
+ !> (integrate 48 files)
+____________________________________________________________________________
+[ 3553] By: gsar on 1999/06/27 14:28:49
+ Log: somewhat untested PERL_OBJECT cleanups (C++isms mostly
+ gone from the public API); PERL_OBJECT builds again on
+ windows
+
+ TODO: namespace-clean the typedefs in iperlsys.h and
+ elsewhere; remove C++ remnants from public headers
+ Branch: perl
+ ! XSUB.h bytecode.pl cv.h embed.h embed.pl ext/B/B.xs
+ ! ext/ByteLoader/ByteLoader.xs ext/ByteLoader/bytecode.h
+ ! ext/ByteLoader/byterun.c ext/ByteLoader/byterun.h
+ ! ext/DynaLoader/dlutils.c global.sym globals.c iperlsys.h
+ ! lib/ExtUtils/Embed.pm lib/ExtUtils/xsubpp mg.c objXSUB.h
+ ! opcode.h opcode.pl perl.c perl.h pod/perlhist.pod pp_ctl.c
+ ! pp_hot.c proto.h scope.h sv.h toke.c universal.c util.c
+ ! win32/GenCAPI.pl win32/Makefile win32/config.bc
+ ! win32/config.gc win32/config.vc win32/dl_win32.xs
+ ! win32/makedef.pl win32/makefile.mk win32/perllib.c
+ ! win32/runperl.c win32/win32.c win32/win32.h win32/win32iop.h
+ ! win32/win32sck.c
+____________________________________________________________________________
+[ 3552] By: gsar on 1999/06/27 13:49:31
+ Log: integrate cfgperl changes into mainline
+ Branch: perl
+ !> dump.c embed.h embed.pl embedvar.h global.sym intrpvar.h mg.c
+ !> objXSUB.h op.c perl.c perl.h perlvars.h pp.c pp_ctl.c
+ !> pp_proto.h pp_sys.c proto.h sv.c t/pragma/locale.t toke.c
+ !> util.c
+____________________________________________________________________________
+[ 3551] By: gsar on 1999/06/27 13:31:11
+ Log: fix indents
+ Branch: perl
+ ! op.c
+____________________________________________________________________________
+[ 3550] By: gsar on 1999/06/24 22:42:53
+ Log: update Changes
+ Branch: perl
+ ! Changes
+____________________________________________________________________________
[ 3549] By: gsar on 1999/06/24 22:41:17
Log: avoid race condition in the CAPI extension bootstrap handler
Branch: perl
diff --git a/win32/win32.c b/win32/win32.c
index 2df9c7c880..eb486e3a48 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1439,15 +1439,11 @@ win32_uname(struct utsname *name)
char *arch;
GetSystemInfo(&info);
-#ifdef __MINGW32__
- switch (info.DUMMYUNIONNAME.DUMMYSTRUCTNAME.wProcessorArchitecture) {
-#else
-#ifdef __BORLANDC__
+#if defined(__BORLANDC__) || defined(__MINGW32__)
switch (info.u.s.wProcessorArchitecture) {
#else
switch (info.wProcessorArchitecture) {
#endif
-#endif
case PROCESSOR_ARCHITECTURE_INTEL:
arch = "x86"; break;
case PROCESSOR_ARCHITECTURE_MIPS:
diff --git a/win32/win32.h b/win32/win32.h
index ee25b5afce..75e3c61cbb 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -23,7 +23,7 @@
#endif
#ifdef __GNUC__
-// typedef long long __int64;
+typedef long long __int64;
# define Win32_Winsock
/* GCC does not do __declspec() - render it a nop
* and turn on options to avoid importing data