From 5fdf7a41294d223fcbbbfca45e6d3ca256913d17 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Tue, 29 Apr 2003 08:05:41 +0000
Subject: [PATCH] fixes for OS X 10.2

---
 2d/2dsline.c     | 7 +++++--
 configure.ac     | 4 ++++
 libmve/mveplay.c | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/2d/2dsline.c b/2d/2dsline.c
index d8074056..62f0a1ce 100644
--- a/2d/2dsline.c
+++ b/2d/2dsline.c
@@ -1,4 +1,4 @@
-/* $Id: 2dsline.c,v 1.9 2002-10-12 03:09:23 btb Exp $ */
+/* $Id: 2dsline.c,v 1.10 2003-04-29 08:05:41 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -142,7 +142,10 @@ void gr_linear_darken(ubyte * dest, int darkening_level, int count, ubyte * fade
 	register int i;
 
 	for (i=0;i<count;i++)
-		*dest=fade_table[(*dest++)+(darkening_level*256)];
+	{
+		*dest = fade_table[(*dest)+(darkening_level*256)];
+		dest++;
+	}
 }
 
 #endif
diff --git a/configure.ac b/configure.ac
index 0f651c1d..28e671bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,7 @@ AC_PROG_CXX
 AC_STDC_HEADERS
 AC_PATH_PROGS(NASM, nasm nasmw, no)
 AC_C_BIGENDIAN
+AC_CHECK_DECLS(nanosleep)
 
 case $host_cpu in
 	sparc)
@@ -298,6 +299,9 @@ AM_CONDITIONAL(USE_ASM, test x$enable_assembler != xno)
 
 AH_BOTTOM([
         /* General defines */
+#ifndef PACKAGE_STRING
+#define PACKAGE_STRING PACKAGE " " VERSION
+#endif
 #define VERSION_NAME PACKAGE_STRING
 #define NMONO 1
 #define PIGGY_USE_PAGING 1
diff --git a/libmve/mveplay.c b/libmve/mveplay.c
index b49c0538..8c6d48b9 100644
--- a/libmve/mveplay.c
+++ b/libmve/mveplay.c
@@ -1,4 +1,4 @@
-/* $Id: mveplay.c,v 1.9 2003-04-12 00:45:03 btb Exp $ */
+/* $Id: mveplay.c,v 1.10 2003-04-29 08:05:41 btb Exp $ */
 #ifdef HAVE_CONFIG_H
 #include <conf.h>
 #endif
@@ -130,7 +130,7 @@ static int micro_frame_delay=0;
 static int timer_started=0;
 static struct timeval timer_expire = {0, 0};
 
-#if defined(__APPLE__) && defined(__MACH__)
+#if defined(HAVE_DECL_NANOSLEEP) && !HAVE_DECL_NANOSLEEP
 int nanosleep(struct timespec *ts, void *rem);
 #endif
 
-- 
2.39.2