From 9d82110b57abcc9292ed41603675b345d4e1f5f6 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Fri, 22 Nov 2002 06:24:10 +0000
Subject: [PATCH] Some cleanups for PocketPC port.

---
 archivers/dir.c    | 2 --
 archivers/grp.c    | 3 ---
 archivers/qpak.c   | 3 ---
 archivers/zip.c    | 4 +---
 configure.in       | 2 +-
 makeos2.cmd        | 2 +-
 physfs.c           | 2 --
 physfs_byteorder.c | 1 -
 physfs_internal.h  | 6 ++++++
 platform/beos.cpp  | 1 -
 platform/os2.c     | 1 -
 platform/posix.c   | 1 -
 platform/win32.c   | 1 -
 13 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/archivers/dir.c b/archivers/dir.c
index 4e7395b5..2fc2f1c9 100644
--- a/archivers/dir.c
+++ b/archivers/dir.c
@@ -13,8 +13,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <fcntl.h>
 #include "physfs.h"
 
 #define __PHYSICSFS_INTERNAL__
diff --git a/archivers/grp.c b/archivers/grp.c
index 31a9717c..2bfa1edd 100644
--- a/archivers/grp.c
+++ b/archivers/grp.c
@@ -33,9 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <assert.h>
 #include "physfs.h"
 
 #define __PHYSICSFS_INTERNAL__
diff --git a/archivers/qpak.c b/archivers/qpak.c
index 17721b74..71da2102 100644
--- a/archivers/qpak.c
+++ b/archivers/qpak.c
@@ -16,9 +16,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <assert.h>
 #include "physfs.h"
 
 #define __PHYSICSFS_INTERNAL__
diff --git a/archivers/zip.c b/archivers/zip.c
index 78042b3d..47de003d 100644
--- a/archivers/zip.c
+++ b/archivers/zip.c
@@ -16,10 +16,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
-#include <time.h>
 #include <errno.h>
-
+#include <time.h>
 #include "physfs.h"
 #include "zlib.h"
 
diff --git a/configure.in b/configure.in
index f2d93389..26aebed0 100644
--- a/configure.in
+++ b/configure.in
@@ -436,7 +436,7 @@ fi
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stdlib.h string.h])
+AC_CHECK_HEADERS([stdlib.h string.h assert.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 dnl AC_C_CONST
diff --git a/makeos2.cmd b/makeos2.cmd
index 7feac510..61254f93 100644
--- a/makeos2.cmd
+++ b/makeos2.cmd
@@ -7,7 +7,7 @@ rem  Patches go to icculus@clutteredmind.org ...
 
 set PHYSFSLANG=PHYSFS_LANG_ENGLISH
 set DEBUGFLAGS=-D_NDEBUG -O2 -s
-set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib114 -c -D__ST_MT_ERRNO__ -DOS2 -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_LANG=%PHYSFSLANG%
+set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib114 -c -D__ST_MT_ERRNO__ -DOS2 -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_LANG=%PHYSFSLANG% -DHAVE_ASSERT_H=1
 
 @echo on
 mkdir bin
diff --git a/physfs.c b/physfs.c
index acb93fb6..9e12cf62 100644
--- a/physfs.c
+++ b/physfs.c
@@ -20,8 +20,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>
-#include <errno.h>
 #include "physfs.h"
 
 #define __PHYSICSFS_INTERNAL__
diff --git a/physfs_byteorder.c b/physfs_byteorder.c
index ec50c265..989051bc 100644
--- a/physfs_byteorder.c
+++ b/physfs_byteorder.c
@@ -14,7 +14,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 
 #define __PHYSICSFS_INTERNAL__
 #include "physfs_internal.h"
diff --git a/physfs_internal.h b/physfs_internal.h
index 805a603e..2fa6ee06 100644
--- a/physfs_internal.h
+++ b/physfs_internal.h
@@ -16,6 +16,12 @@
 
 #include "physfs.h"
 
+#ifdef HAVE_ASSERT_H
+#include <assert.h>
+#else
+#define assert(x)
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/platform/beos.cpp b/platform/beos.cpp
index 4ac00c02..664ee5ba 100644
--- a/platform/beos.cpp
+++ b/platform/beos.cpp
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <assert.h>
 #include <unistd.h>
 
 #define __PHYSICSFS_INTERNAL__
diff --git a/platform/os2.c b/platform/os2.c
index 0ee60fe8..f6662b3a 100644
--- a/platform/os2.c
+++ b/platform/os2.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <assert.h>
 #include <time.h>
 #include <ctype.h>
 
diff --git a/platform/posix.c b/platform/posix.c
index 85d28753..eab5d660 100644
--- a/platform/posix.c
+++ b/platform/posix.c
@@ -43,7 +43,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <assert.h>
 
 #ifdef PHYSFS_HAVE_LLSEEK
 #include <linux/unistd.h>
diff --git a/platform/win32.c b/platform/win32.c
index 29943845..a928bbd4 100644
--- a/platform/win32.c
+++ b/platform/win32.c
@@ -19,7 +19,6 @@
 #include <errno.h>
 #include <ctype.h>
 #include <time.h>
-#include <assert.h>
 
 #define __PHYSICSFS_INTERNAL__
 #include "physfs_internal.h"