[Emacs-diffs] /srv/bzr/emacs/trunk r102395: * lib-src/test-distrib.c: Remove include guards for config.h and fcntl.h.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 102395
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Sun 2010-11-14 22:42:21 -0800
message:
  * 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".
modified:
  lib-src/ChangeLog
  lib-src/test-distrib.c

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2010-10-25 00:48:26 +0000
+++ b/lib-src/ChangeLog 2010-11-15 06:42:21 +0000
@@ -1,3 +1,9 @@
+2010-11-15  Dan Nicolaescu  <address@hidden>
+
+       * 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  <address@hidden>
 
        * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Remove easymenu.elc.

=== modified file 'lib-src/test-distrib.c'
--- a/lib-src/test-distrib.c    2010-10-03 23:35:22 +0000
+++ b/lib-src/test-distrib.c    2010-11-15 06:42:21 +0000
@@ -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)
     {