COPYING duplicates information from README. Remove. Move GPL from

[empserver] / include / power.h

diff --git a/include/power.h b/include/power.h
index 27339c21ebcf38145e038caec6e8c5a37ac2eacc..d24302c096a4d3f370bde454b8a37545aaeb8af3 100644 (file)
--- a/include/power.h
+++ b/include/power.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, 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.
  *
  *  ---
  *
@@ -31,8 +31,8 @@
  *     
  */
 
-#ifndef _POWER_H_
-#define _POWER_H_
+#ifndef POWER_H
+#define POWER_H
 
 struct powstr {
     natid p_nation;
@@ -56,10 +56,10 @@ struct powstr {
 };
 
 #define getpower(n, p) \
-       ef_read(EF_POWER, n, (caddr_t)p)
+       ef_read(EF_POWER, n, p)
 #define putpower(n, p) \
-       ef_write(EF_POWER, n, (caddr_t)p)
+       ef_write(EF_POWER, n, p)
 #define getpowerp(n) \
        (struct powstr *) ef_ptr(EF_POWER, n)
 
-#endif /* _POWER_H_ */
+#endif