Partial commit of OpenBSD fixes by Thorsten Glaser and someone else whose

name I don't know, more to follow.

zsnes/src/config.h.in

@@ -5,3 +5,4 @@
 #undef HAVE_SYS_DIR_H
 #undef HAVE_NDIR_H
 #undef HAVE_MEMCPY
+#undef HAVE_UNISTD_H

zsnes/src/configure.in

@@ -27,6 +27,10 @@ case "$target" in
 		CFLAGS="$CFLAGS -D__LINUX__"
         	NFLAGS="$NFLAGS -D__LINUX__ -f elf"
 		;;
+	*-*-*openbsd*)
+		CFLAGS="$CFLAGS -D__LINUX__ -D__FreeBSD__"
+		NFLAGS="$NFLAGS -D__LINUX__ -D__FreeBSD__ -D__OpenBSD__ -f aoutb"
+		;;
 	*-*-*bsd*)
 		CFLAGS="$CFLAGS -D__LINUX__ -D__FreeBSD__"
 		NFLAGS="$NFLAGS -D__LINUX__ -D__FreeBSD__ -f elf"
@@ -114,6 +118,10 @@ if test x$with_png != xno; then
 else
 	AC_MSG_RESULT(disabled by user)
 fi
+if test x$with_png != xyes; then
+	CFLAGS="$CFLAGS -DNO_PNG"
+	NFLAGS="$NFLAGS -DNO_PNG"
+fi
 dnl -- Various debug and optimization option checks
 
 AC_ARG_ENABLE(debug, [  --enable-debug          Build GDB Friendly binary (zsnes-debug) ],debug=yes)

zsnes/src/gblhdr.h

@@ -98,14 +98,16 @@
 	#include <glob.h>
 	#include <sys/stat.h>
 	#include <sys/ioctl.h>
-	#include <arpa/inet.h>
-	#include <netinet/in.h>
-	#include <sys/types.h>
 	#include <sys/socket.h>
+	#include <sys/types.h>
+	#include <netinet/in.h>
+	#include <arpa/inet.h>
 	#include <netdb.h>
 	#include <utime.h>
 	#include <zlib.h>
-	#include <png.h>
+	#ifndef NO_PNG
+		#include <png.h>
+	#endif
 	#endif
 
 	#ifdef __LINUX__

zsnes/src/gui/menu.asm

@@ -33,7 +33,9 @@ EXTSYM Clear2xSaIBuffer
 EXTSYM romdata,romtype,ScreenShotFormat
 EXTSYM Voice0Disable,Voice1Disable,Voice2Disable,Voice3Disable
 EXTSYM Voice4Disable,Voice5Disable,Voice6Disable,Voice7Disable
+%ifndef NO_PNG
 EXTSYM Grab_PNG_Data
+%endif
 
 NEWSYM MenuAsmStart
 
@@ -184,9 +186,11 @@ NEWSYM showmenu
 .nomenuinc3
 
     mov dword[menudrawbox8b.stringi+13],' BMP'
+%ifndef NO_PNG 
     cmp byte[ScreenShotFormat],0
     je .normalscrn
     mov dword[menudrawbox8b.stringi+13],' PNG'
+%endif
 .normalscrn
     cmp byte[cbitmode],1
     je near .nopcx
@@ -1068,11 +1072,13 @@ NEWSYM pcxheader
 NEWSYM picnum, dw 0
 
 NEWSYM savepcx
+%ifndef NO_PNG
         cmp byte[ScreenShotFormat],1
         jne .notpng
         call Grab_PNG_Data
 	ret
 .notpng
+%endif
     
     mov byte[pressed+1],0
     mov byte[pressed+59],0

zsnes/src/linux/sw_draw.c

@@ -69,7 +69,7 @@ BOOL sw_start(int width, int height, int req_depth, int FullScreen)
     // Grab mouse in fullscreen mode
     FullScreen ? SDL_WM_GrabInput(SDL_GRAB_ON) : SDL_WM_GrabInput(SDL_GRAB_OFF);
 
-    SDL_WM_SetCaption ("ZSNES Linux","ZSNES");
+    SDL_WM_SetCaption ("ZSNES","ZSNES");
     SDL_ShowCursor(0);
 
     // Check hardware for 565/555

zsnes/src/ui.asm

@@ -152,7 +152,7 @@ NEWSYM welcome
 
                  db 'ZSNES v1.',ZVERSION,' beta (c) 1997-2002, ZSNES Team (zsKnight & _Demo_)',13,10
 %ifdef __LINUX__
-                 db 'Compiled under NASM and GCC. (Linux/FreeBSD)',13,10,13,10
+                 db 'Compiled under NASM and GCC. (*nix)',13,10,13,10
 %else
 %ifdef __WIN32__
                  db 'Compiled under NASM and MSVC++. (Windows)',13,10,13,10