# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1289803341 28800
# Node ID ae7e9ce45a168b9da3305dcbdc2a377f53a37082
# Parent  b678d49db641c7c7423037d6d5a01fa1f9f99ea4
* lib-src/test-distrib.c: Remove include guards for config.h and fcntl.h.
(O_RDONLY): Do not define.
(cool_read): Fix type for variable "sofar".

diff -r b678d49db641 -r ae7e9ce45a16 lib-src/ChangeLog
--- a/lib-src/ChangeLog	Sun Nov 14 22:39:02 2010 -0800
+++ b/lib-src/ChangeLog	Sun Nov 14 22:42:21 2010 -0800
@@ -1,3 +1,9 @@
+2010-11-15  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* test-distrib.c: Remove include guards for config.h and fcntl.h.
+	(O_RDONLY): Do not define.
+	(cool_read): Fix type for variable "sofar".
+
 2010-10-25  Glenn Morris  <rgm@gnu.org>
 
 	* makefile.w32-in (OTHER_PLATFORM_SUPPORT): Remove easymenu.elc.
diff -r b678d49db641 -r ae7e9ce45a16 lib-src/test-distrib.c
--- a/lib-src/test-distrib.c	Sun Nov 14 22:39:02 2010 -0800
+++ b/lib-src/test-distrib.c	Sun Nov 14 22:42:21 2010 -0800
@@ -19,24 +19,14 @@
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
 #include <stdio.h>
-
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#ifndef O_RDONLY
-#define O_RDONLY 0
-#endif
-
 /* Break string in two parts to avoid buggy C compilers that ignore characters
    after nulls in strings.  */
 
@@ -55,7 +45,7 @@
 cool_read (int fd, char *buf, size_t size)
 {
   ssize_t num;
-  size_t sofar = 0;
+  ssize_t sofar = 0;
 
   while (1)
     {