From: Malcolm Beattie <mbeattie@sable.ox.ac.uk>
Date: Thu, 28 May 1998 18:07:24 +0000 (+0000)
Subject: Integrated win32 branch into mainline. The changes to t/op/ipc*.t
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1a621c465c9560e7209563b9aca8042abcf43dcc;p=p5sagit%2Fp5-mst-13.2.git

Integrated win32 branch into mainline. The changes to t/op/ipc*.t
in change 1043 clashed badly with changes made in the win32
branch. I did an accept on the win32 branch version for now.

p4raw-id: //depot/perl@1048
---

1a621c465c9560e7209563b9aca8042abcf43dcc
diff --cc win32/config.gc
index 295009d,19b33d5..46dc9ac
--- a/win32/config.gc
+++ b/win32/config.gc
@@@ -260,10 -257,9 +260,10 @@@ d_telldir='define
  d_time='define'
  d_times='define'
  d_truncate='undef'
- d_tzname='define'
+ d_tzname='undef'
  d_umask='define'
  d_uname='undef'
 +d_union_semun='define'
  d_vfork='undef'
  d_void_closedir='undef'
  d_voidsig='define'