COPYING duplicates information from README. Remove. Move GPL from

[empserver] / include / ioqueue.h

diff --git a/include/ioqueue.h b/include/ioqueue.h
index d836e9ab536076368f967a2e45fd1ccce510e9b3..9c5ae76f1e6f5b31c21ffbc4efda995857623b2a 100644 (file)
--- a/include/ioqueue.h
+++ b/include/ioqueue.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -51,7 +51,11 @@ struct ioqueue {
 extern struct ioqueue *ioq_create(int size);
 extern void ioq_destroy(struct ioqueue *ioq);
 extern void ioq_drain(struct ioqueue *ioq);
+#if defined (_WIN32)
+extern int ioq_makebuf(struct ioqueue *ioq, char *pBuf, int nBufLen);
+#else
 extern int ioq_makeiov(struct ioqueue *ioq, struct iovec *iov, int cc);
+#endif
 extern int ioq_peek(struct ioqueue *ioq, s_char *buf, int cc);
 extern int ioq_dequeue(struct ioqueue *ioq, int cc);
 extern void ioq_append(struct ioqueue *ioq, s_char *buf, int cc);
@@ -59,8 +63,4 @@ extern int ioq_qsize(struct ioqueue *ioq);
 extern int ioq_gets(struct ioqueue *ioq, s_char *buf, int cc);
 extern int ioq_puts(struct ioqueue *ioq, s_char *buf);
 
-#if defined (_WIN32)
-extern int ioq_makebuf(struct ioqueue *ioq, char *pBuf, int nBufLen);
-#endif
-
 #endif