2 files changed, 7 insertions, 11 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index a4b0ff37d07..e402fe44f94 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -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 --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index 1487c2bab57..aca46f121fa 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -19,24 +19,14 @@ You should have received a copy of the GNU General Public License
 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 @@ int
 cool_read (int fd, char *buf, size_t size)
 {
   ssize_t num;
-  size_t sofar = 0;
+  ssize_t sofar = 0;
 
   while (1)
     {