Integrated win32 branch into mainline. The changes to t/op/ipc*.t
Malcolm Beattie [Thu, 28 May 1998 18:07:24 +0000 (18:07 +0000)]
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

1  2 
MANIFEST
win32/config.gc

diff --cc MANIFEST
Simple merge
diff --cc 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'