merge with 3.9h

diff --git a/lib/backupfile.c b/lib/backupfile.c
index 36094af..2888034 100644 (file)
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -19,14 +19,7 @@
    Some algorithms adapted from GNU Emacs. */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <stdio.h>

diff --git a/lib/dirname.c b/lib/dirname.c
index cb53eb4..9290614 100644 (file)
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -16,14 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #ifdef STDC_HEADERS

diff --git a/lib/fileblocks.c b/lib/fileblocks.c
index ee82f75..83ac04f 100644 (file)
--- a/lib/fileblocks.c
+++ b/lib/fileblocks.c
@@ -18,14 +18,7 @@
 /* Written by Brian L. Matthews, blm@6sceng.UUCP. */
 \f
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #if !defined (HAVE_ST_BLOCKS) && !defined(_POSIX_SOURCE)

diff --git a/lib/filemode.c b/lib/filemode.c
index 838f49a..e88fc12 100644 (file)
--- a/lib/filemode.c
+++ b/lib/filemode.c
@@ -16,11 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 \f
 #ifdef HAVE_CONFIG_H
-#if defined (emacs) || defined (CONFIG_BROKETS)
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/fsusage.c b/lib/fsusage.c
index d60a4c6..9bef62a 100644 (file)
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -16,14 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/ftruncate.c b/lib/ftruncate.c
index 58cd2bb..1272ee7 100644 (file)
--- a/lib/ftruncate.c
+++ b/lib/ftruncate.c
@@ -2,14 +2,7 @@
    This file is in the public domain.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/full-write.c b/lib/full-write.c
index 6e2e446..339fb1a 100644 (file)
--- a/lib/full-write.c
+++ b/lib/full-write.c
@@ -19,14 +19,7 @@
    */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>
@@ -47,7 +40,7 @@ int
 full_write (desc, ptr, len)
      int desc;
      char *ptr;
-     int len;
+     size_t len;
 {
   int total_written;
 

diff --git a/lib/isdir.c b/lib/isdir.c
index adfd88a..dbc9bd0 100644 (file)
--- a/lib/isdir.c
+++ b/lib/isdir.c
@@ -16,14 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/makepath.c b/lib/makepath.c
index 9725168..f0303fa 100644 (file)
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -19,14 +19,7 @@
    Jim Meyering <meyering@cs.utexas.edu>.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #ifdef __GNUC__

diff --git a/lib/modechange.c b/lib/modechange.c
index 1c0a591..8eb8dc5 100644 (file)
--- a/lib/modechange.c
+++ b/lib/modechange.c
@@ -25,14 +25,7 @@
    performance gain. */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/rename.c b/lib/rename.c
index b2cf2ce..6319397 100644 (file)
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -16,14 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/safe-read.c b/lib/safe-read.c
index 2e131e1..22e705a 100644 (file)
--- a/lib/safe-read.c
+++ b/lib/safe-read.c
@@ -17,14 +17,7 @@
    */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/savedir.c b/lib/savedir.c
index cdf1288..32c793b 100644 (file)
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -18,14 +18,7 @@
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/userspec.c b/lib/userspec.c
index 75000e8..67f1583 100644 (file)
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -18,14 +18,7 @@
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 \f
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #ifdef __GNUC__