Mercurial > flash_v2

changeset 358:ff7641b16d2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* tests/multi_lo_select.c: Need the io_fileio.h header file * tests/tcp_echo.c: (max): definition clashes with the one in the header file lib/libkern/libkern.h
author asl
date Sun, 06 Oct 2002 13:07:53 +0000
parents 2808fe605ef0
children 8b024937045d
files packages/net/common/current/ChangeLog packages/net/common/current/tests/multi_lo_select.c packages/net/common/current/tests/tcp_echo.c
diffstat 3 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/packages/net/common/current/ChangeLog
+++ b/packages/net/common/current/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-06  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* tests/multi_lo_select.c: Need the io_fileio.h header file
+	* tests/tcp_echo.c: (max): definition clashes with the one in
+	the header file lib/libkern/libkern.h
+
 2002-08-16  Gary Thomas  <gthomas@ecoscentric.com> (on behalf of)
 2002-08-16  Louis Hamilton <hamilton@redhat.com>	
 
--- a/packages/net/common/current/tests/multi_lo_select.c
+++ b/packages/net/common/current/tests/multi_lo_select.c
@@ -87,6 +87,7 @@
 #define NLISTENERS (CYGPKG_IO_NFILE/3)
 #endif
 #else
+#include <pkgconf/io_fileio.h>
 #if CYGNUM_FILEIO_NFD > 30
 #define NLISTENERS 10
 #else
--- a/packages/net/common/current/tests/tcp_echo.c
+++ b/packages/net/common/current/tests/tcp_echo.c
@@ -67,8 +67,8 @@
 
 #include <network.h>
 
-static __inline__ int
-max(int m, int n)
+static __inline__ unsigned int
+max(unsigned int m, unsigned int n)
 {
     return m > n ? m : n;
 }