client: Unbreak standalone build

[empserver] / include / empio.h

diff --git a/include/empio.h b/include/empio.h
index d85392ab0eb9f3cfddee1dac3786399ec12cbfdf..ba187199db06151913839d4a882ed849dac8334b 100644 (file)
--- a/include/empio.h
+++ b/include/empio.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,59 +14,49 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
- *  empio.h: Describes io pointers used in Empire
- * 
+ *  empio.h: Describes I/O pointers used in Empire
+ *
  *  Known contributors to this file:
- *  
+ *     Markus Armbruster, 2004-2012
  */
 
-#ifndef _EMPIO_H_
-#define _EMPIO_H_
-
-#include <time.h>              /* struct timeval */
+#ifndef EMPIO_H
+#define EMPIO_H
+#include <time.h>
 
-#define        IO_READ         0x1
+#define IO_READ                0x1
 #define IO_WRITE       0x2
-#define IO_NEWSOCK     0x4
-#define IO_NBLOCK      0x8
-#define        IO_EOF          0x10
-#define IO_CONN                0x20
+#define IO_EOF         0x10
 #define IO_ERROR       0x40
 
 #define IO_BUFSIZE     4096
 
-#define IO_NOWAIT      0
-#define IO_WAIT                1
-
-extern struct iop *io_open(int, int, int, int (*)(void), s_char *);
+extern struct iop *io_open(int, int, int);
 extern void io_init(void);
-extern int io_noblocking(struct iop *, int);
-extern void io_close(struct iop *);
-extern int io_input(struct iop *, int);
+extern void io_close(struct iop *, time_t);
+extern int io_input(struct iop *, time_t);
 extern int io_inputwaiting(struct iop *);
 extern int io_outputwaiting(struct iop *);
-extern int io_output(struct iop *, int);
-extern int io_peek(struct iop *, s_char *, int);
-extern int io_read(struct iop *, s_char *, int);
-extern int io_write(struct iop *, s_char *, int, int);
-extern int io_output_all(struct iop *);
-extern int io_gets(struct iop *, s_char *, int);
-extern int io_puts(struct iop *, s_char *);
-extern int io_shutdown(struct iop *, int);
-extern int io_conn(struct iop *);
+extern int io_output(struct iop *, time_t);
+extern int io_output_if_queue_long(struct iop *, time_t);
+extern int io_peek(struct iop *, char *, int);
+extern int io_read(struct iop *, char *, int);
+extern int io_write(struct iop *, char *, int);
+extern int io_gets(struct iop *, char *, int);
+extern int io_puts(struct iop *, char *);
 extern int io_error(struct iop *);
 extern int io_eof(struct iop *);
+extern void io_set_eof(struct iop *);
 extern int io_fileno(struct iop *);
 
-#endif /* _EMPIO_H_ */
+#endif