Mercurial > hg > early-roguelike

changeset 284:6376b514a30b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix more header-related warnings. This fixes all current default warnings with GCC7 on Linux. That does not mean the code is anywhere close to clean.
author John "Elwin" Edwards
date Fri, 22 Sep 2017 16:24:40 -0400
parents d71e5e1f49cf
children 17005af49963
files arogue5/configure.ac arogue5/mdport.c arogue7/configure.ac arogue7/mdport.c rogue4/mach_dep.c rogue4/mdport.c urogue/configure.ac urogue/mdport.c xrogue/configure.ac xrogue/state.c
diffstat 10 files changed, 53 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/arogue5/configure.ac	Mon Sep 18 19:36:14 2017 -0400
+++ b/arogue5/configure.ac	Fri Sep 22 16:24:40 2017 -0400
@@ -13,7 +13,7 @@
 MP_WITH_CURSES
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([pwd.h errno.h fcntl.h limits.h nlist.h stdlib.h string.h sys/ioctl.h sys/utsname.h termios.h unistd.h utmp.h term.h ncurses/term.h process.h])
+AC_CHECK_HEADERS([pwd.h errno.h fcntl.h limits.h nlist.h stdlib.h string.h sys/ioctl.h sys/utsname.h termios.h unistd.h utmp.h term.h ncurses/term.h process.h arpa/inet.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIZE_T
--- a/arogue5/mdport.c	Mon Sep 18 19:36:14 2017 -0400
+++ b/arogue5/mdport.c	Fri Sep 22 16:24:40 2017 -0400
@@ -41,11 +41,16 @@
 #undef MOUSE_MOVED
 #elif defined(__DJGPP__)
 #include <process.h>
+#else
+#include <sys/wait.h>
 #endif
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
 #ifdef HAVE_SYS_UTSNAME_H
 #include <sys/utsname.h>
 #endif
@@ -552,7 +557,7 @@
 unsigned long int
 md_ntohl(unsigned long int x)
 {
-#ifdef _WIN32
+#ifndef HAVE_ARPA_INET_H
     if ( *((char *)&md_endian) == 0x01 )
         return(x);
     else
@@ -568,7 +573,7 @@
 unsigned long int
 md_htonl(unsigned long int x)
 {
-#ifdef _WIN32
+#ifndef HAVE_ARPA_INET_H
     if ( *((char *)&md_endian) == 0x01 )
         return(x);
     else
--- a/arogue7/configure.ac	Mon Sep 18 19:36:14 2017 -0400
+++ b/arogue7/configure.ac	Fri Sep 22 16:24:40 2017 -0400
@@ -12,7 +12,7 @@
 MP_WITH_CURSES
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([pwd.h errno.h fcntl.h limits.h stdlib.h string.h sys/ioctl.h sys/utsname.h termios.h unistd.h utmp.h term.h ncurses/term.h process.h])
+AC_CHECK_HEADERS([pwd.h errno.h fcntl.h limits.h stdlib.h string.h sys/ioctl.h sys/utsname.h termios.h unistd.h utmp.h term.h ncurses/term.h process.h arpa/inet.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIZE_T
--- a/arogue7/mdport.c	Mon Sep 18 19:36:14 2017 -0400
+++ b/arogue7/mdport.c	Fri Sep 22 16:24:40 2017 -0400
@@ -29,6 +29,10 @@
     SUCH DAMAGE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #if defined(_WIN32)
 #include <Windows.h>
 #include <Lmcons.h>
@@ -40,6 +44,7 @@
 #include <process.h>
 #else
 #include <pwd.h>
+#include <sys/wait.h>
 #include <sys/utsname.h>
 #include <unistd.h>
 #endif
@@ -73,6 +78,10 @@
 #include <signal.h>
 #include <time.h>
 
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
 #define MOD_MOVE(c) (toupper(c) )
 
 void
@@ -533,7 +542,7 @@
 unsigned long int
 md_ntohl(unsigned long int x)
 {
-#ifdef _WIN32
+#ifndef HAVE_ARPA_INET_H
     if ( *((char *)&md_endian) == 0x01 )
         return(x);
     else
@@ -549,7 +558,7 @@
 unsigned long int
 md_htonl(unsigned long int x)
 {
-#ifdef _WIN32
+#ifndef HAVE_ARPA_INET_H
     if ( *((char *)&md_endian) == 0x01 )
         return(x);
     else
--- a/rogue4/mach_dep.c	Mon Sep 18 19:36:14 2017 -0400
+++ b/rogue4/mach_dep.c	Fri Sep 22 16:24:40 2017 -0400
@@ -38,6 +38,11 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
+
+#ifdef CHECKTIME
+#include <unistd.h>
+#endif
+
 #include "rogue.h"
 
 int num_checks;		/* times we've gone over in checkout() */
@@ -266,10 +271,10 @@
 
 #ifdef CHECKTIME
 	checktime = (CHECKTIME * 60) / num_checks;
-#endif
 #ifdef SIGALRM
 	alarm(checktime);
 #endif
+#endif
 
 	chmsg(msgs[num_checks - 1], ((double) checktime / 60.0));
     }
--- a/rogue4/mdport.c	Mon Sep 18 19:36:14 2017 -0400
+++ b/rogue4/mdport.c	Fri Sep 22 16:24:40 2017 -0400
@@ -43,6 +43,8 @@
 #undef MOUSE_MOVED
 #elif defined(__DJGPP__)
 #include <process.h>
+#else
+#include <sys/wait.h>
 #endif
 
 #ifdef HAVE_PWD_H
@@ -54,6 +56,9 @@
 #ifdef HAVE_UTMPX_H
 #include <utmpx.h>
 #endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
 
 #ifdef __INTERIX
 char *strdup(const char *s);
@@ -535,7 +540,7 @@
 unsigned long int
 md_ntohl(unsigned long int x)
 {
-#ifdef _WIN32
+#ifndef HAVE_ARPA_INET_H
     if ( *((char *)&md_endian) == 0x01 )
         return(x);
     else
@@ -551,7 +556,7 @@
 unsigned long int
 md_htonl(unsigned long int x)
 {
-#ifdef _WIN32
+#ifndef HAVE_ARPA_INET_H
     if ( *((char *)&md_endian) == 0x01 )
         return(x);
     else
--- a/urogue/configure.ac	Mon Sep 18 19:36:14 2017 -0400
+++ b/urogue/configure.ac	Fri Sep 22 16:24:40 2017 -0400
@@ -12,7 +12,7 @@
 MP_WITH_CURSES
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([pwd.h errno.h fcntl.h limits.h nlist.h stdlib.h string.h sys/ioctl.h termios.h unistd.h utmp.h utmpx.h term.h ncurses/term.h process.h])
+AC_CHECK_HEADERS([pwd.h errno.h fcntl.h limits.h nlist.h stdlib.h string.h sys/ioctl.h termios.h unistd.h utmp.h utmpx.h term.h ncurses/term.h process.h arpa/inet.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_UID_T
--- a/urogue/mdport.c	Mon Sep 18 19:36:14 2017 -0400
+++ b/urogue/mdport.c	Fri Sep 22 16:24:40 2017 -0400
@@ -49,6 +49,7 @@
 #else
 #include <pwd.h>
 #include <sys/utsname.h>
+#include <sys/wait.h>
 #include <unistd.h>
 #include <utmpx.h>
 #endif
@@ -57,6 +58,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
 #if defined(_WIN32) && !defined(__MINGW32__)
 #define PATH_MAX MAX_PATH
 #endif
@@ -544,7 +549,7 @@
 unsigned long int
 md_ntohl(unsigned long int x)
 {
-#ifdef _WIN32
+#ifndef HAVE_ARPA_INET_H
     if ( *((char *)&md_endian) == 0x01 )
         return(x);
     else
@@ -560,7 +565,7 @@
 unsigned long int
 md_htonl(unsigned long int x)
 {
-#ifdef _WIN32
+#ifndef HAVE_ARPA_INET_H
     if ( *((char *)&md_endian) == 0x01 )
         return(x);
     else
--- a/xrogue/configure.ac	Mon Sep 18 19:36:14 2017 -0400
+++ b/xrogue/configure.ac	Fri Sep 22 16:24:40 2017 -0400
@@ -12,7 +12,7 @@
 MP_WITH_CURSES
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([pwd.h errno.h fcntl.h limits.h stdlib.h string.h sys/ioctl.h sys/utsname.h termios.h unistd.h term.h ncurses/term.h process.h])
+AC_CHECK_HEADERS([pwd.h errno.h fcntl.h limits.h stdlib.h string.h sys/ioctl.h sys/utsname.h termios.h unistd.h term.h ncurses/term.h process.h arpa/inet.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIZE_T
--- a/xrogue/state.c	Mon Sep 18 19:36:14 2017 -0400
+++ b/xrogue/state.c	Fri Sep 22 16:24:40 2017 -0400
@@ -52,6 +52,10 @@
 #define RSXR_COORDLIST    0XABCD0016
 #define RSXR_ROOMS        0XABCD0017
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #if defined(_WIN32)
 #include <Windows.h>
 #include <Lmcons.h>
@@ -62,6 +66,7 @@
 #include <process.h>
 #else
 #include <pwd.h>
+#include <sys/wait.h>
 #include <sys/utsname.h>
 #include <unistd.h>
 #endif
@@ -84,6 +89,10 @@
 #include <process.h>
 #endif
 
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
 int md_fileno(FILE *fp);
 
 #define READSTAT ((format_error == 0) && (read_error == 0))
@@ -3439,7 +3448,7 @@
 unsigned long int
 md_ntohl(unsigned long int x)
 {
-#ifdef _WIN32
+#ifndef HAVE_ARPA_INET_H
     if ( *((char *)&md_endian) == 0x01 )
         return(x);
     else
@@ -3455,7 +3464,7 @@
 unsigned long int
 md_htonl(unsigned long int x)
 {
-#ifdef _WIN32
+#ifndef HAVE_ARPA_INET_H
     if ( *((char *)&md_endian) == 0x01 )
         return(x);
     else