changeset 1898:6c2912f7f35b

* include/fileio.h: Only include kapi.h when CYGFUN_IO_FILEIO_SELECT is enabled and then define the select support structures.
author asl
date Fri, 25 Feb 2005 20:36:52 +0000
parents 45b8b118a6a8
children 72c130f0a30d
files packages/io/fileio/current/ChangeLog packages/io/fileio/current/include/fileio.h
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packages/io/fileio/current/ChangeLog
+++ b/packages/io/fileio/current/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-24  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* include/fileio.h: Only include kapi.h when
+	CYGFUN_IO_FILEIO_SELECT is enabled and then define the select
+	support structures.
+
 2005-01-27  Yoshinori Sato  <ysato@users.sourceforge.jp>
 
 	* src/io.cxx (ioctl): Change ioctl to use varargs so that it works
--- a/packages/io/fileio/current/include/fileio.h
+++ b/packages/io/fileio/current/include/fileio.h
@@ -63,7 +63,9 @@
 
 #include <cyg/infra/cyg_type.h>
 #include <cyg/hal/hal_tables.h>
+#ifdef CYGFUN_IO_FILEIO_SELECT
 #include <cyg/kernel/kapi.h>
+#endif
 
 #include <stddef.h>             // NULL, size_t
 #include <limits.h>
@@ -391,6 +393,7 @@ struct cyg_pathconf_info
 __externC int cyg_fs_fgetinfo( int fd, int key, void *buf, int len );
 __externC int cyg_fs_fsetinfo( int fd, int key, void *buf, int len );
 
+#ifdef CYGFUN_IO_FILEIO_SELECT
 //=============================================================================
 // Select support
 
@@ -417,7 +420,7 @@ struct CYG_SELINFO_TAG
 // cyg_selwakeup() is called when the client device matches the select
 // criterion, and needs to wake up a selector.
 __externC void cyg_selwakeup( struct CYG_SELINFO_TAG *sip );
-
+#endif
 //=============================================================================
 // Timestamp support