Don't #include headers already included by perl.h

097ee67dff1c60f2 didn't need to include <locale.h> in locale.c (then
util.c) because it had been included by perl.h since 5.002 beta 1
3f270f98f9305540 missed removing the include of <unistd.h> from perl.c
or perlio.c
de8ca8af19546d49 changed perl.h to also include <sys/wait.h>, but didn't
notice that it code therefore be removed from perl.c, pp_sys.c and util.c

diff --git a/locale.c b/locale.c
index 81c09ab..b7a78fb 100644 (file)
--- a/locale.c
+++ b/locale.c
@@ -28,10 +28,6 @@
 #define PERL_IN_LOCALE_C
 #include "perl.h"
 
 #define PERL_IN_LOCALE_C
 #include "perl.h"
 

-#ifdef I_LOCALE
-#  include <locale.h>
-#endif
-

 #ifdef I_LANGINFO
 #   include <langinfo.h>
 #endif
 #ifdef I_LANGINFO
 #   include <langinfo.h>
 #endif

diff --git a/perl.c b/perl.c
index fa88566..0b3d9c6 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -38,15 +38,7 @@
 #include "nwutil.h"    
 #endif
 
 #include "nwutil.h"    
 #endif
 

-/* XXX If this causes problems, set i_unistd=undef in the hint file.  */
-#ifdef I_UNISTD
-#include <unistd.h>
-#endif
-

 #ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP
 #ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP

-#  ifdef I_SYS_WAIT
-#   include <sys/wait.h>
-#  endif

 #  ifdef I_SYSUIO
 #    include <sys/uio.h>
 #  endif
 #  ifdef I_SYSUIO
 #    include <sys/uio.h>
 #  endif

diff --git a/perlio.c b/perlio.c
index 7e560de..f0d67ae 100644 (file)
--- a/perlio.c
+++ b/perlio.c
@@ -451,13 +451,6 @@ PerlIO_findFILE(PerlIO *pio)
 
 #include "perliol.h"
 
 
 #include "perliol.h"
 

-/*
- * We _MUST_ have <unistd.h> if we are using lseek() and may have large
- * files
- */
-#ifdef I_UNISTD
-#include <unistd.h>
-#endif

 #ifdef HAS_MMAP
 #include <sys/mman.h>
 #endif
 #ifdef HAS_MMAP
 #include <sys/mman.h>
 #endif

diff --git a/pp_sys.c b/pp_sys.c
index ca951e8..eb324df 100644 (file)
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -49,10 +49,6 @@
 #   include <shadow.h>
 #endif
 
 #   include <shadow.h>
 #endif
 

-#ifdef I_SYS_WAIT
-# include <sys/wait.h>
-#endif
-

 #ifdef I_SYS_RESOURCE
 # include <sys/resource.h>
 #endif
 #ifdef I_SYS_RESOURCE
 # include <sys/resource.h>
 #endif

diff --git a/util.c b/util.c
index 70a1496..82d7590 100644 (file)
--- a/util.c
+++ b/util.c
@@ -41,10 +41,6 @@
 int putenv(char *);
 #endif
 
 int putenv(char *);
 #endif
 

-#ifdef I_SYS_WAIT
-#  include <sys/wait.h>
-#endif
-

 #ifdef HAS_SELECT
 # ifdef I_SYS_SELECT
 #  include <sys/select.h>
 #ifdef HAS_SELECT
 # ifdef I_SYS_SELECT
 #  include <sys/select.h>