From 231408d93c6f78652ec6bcf5de817c4e12c1fb99 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Tue, 9 Sep 2025 15:41:06 -0700
Subject: [PATCH] Fixes for FreeBSD compatibility

- Use 0 instead of NULL when comparing with integer values.
- Move from old termio.h interface to termios.h.
- Add missing includes
---
 src/fssimplewindow/src/glx/fsglxwrapper.cpp       |  4 ++--
 src/fssimplewindow/src/nownd/fssimplenowindow.cpp | 12 ++++++------
 src/yssocket/src/yssocket.cpp                     |  1 +
 src/yssystemfont/src/linux/ysunixsystemfont.cpp   |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/fssimplewindow/src/glx/fsglxwrapper.cpp b/src/fssimplewindow/src/glx/fsglxwrapper.cpp
index 69b4cabf..23ecf0ac 100644
--- a/src/fssimplewindow/src/glx/fsglxwrapper.cpp
+++ b/src/fssimplewindow/src/glx/fsglxwrapper.cpp
@@ -339,7 +339,7 @@ void FsResizeWindow(int newWid,int newHei)
 
 int FsCheckWindowOpen(void)
 {
-	if(ysXWnd!=NULL)
+	if(ysXWnd!=0)
 	{
 		return 1;
 	}
@@ -456,7 +456,7 @@ void FsSetWindowTitle(const char windowTitle[])
 
 void FsPollDevice(void)
 {
-	if(NULL==ysXWnd)
+	if(0==ysXWnd)
 	{
 		return;
 	}
diff --git a/src/fssimplewindow/src/nownd/fssimplenowindow.cpp b/src/fssimplewindow/src/nownd/fssimplenowindow.cpp
index 18e21329..aa0f73cf 100644
--- a/src/fssimplewindow/src/nownd/fssimplenowindow.cpp
+++ b/src/fssimplewindow/src/nownd/fssimplenowindow.cpp
@@ -57,7 +57,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	#include <dirent.h>
 	#include <fcntl.h>
 	#include <unistd.h>
-	#include <termio.h>
+	#include <termios.h>
 	#include <stdio.h>
 	#include <stdlib.h>
 	#include <time.h>
@@ -74,7 +74,7 @@ static int mapFSKEYtoVK[FSKEY_NUM_KEYCODE];
 #ifdef __APPLE__
 static struct sgttyb OriginalConsoleSetting;
 #elif !defined(_WIN32)
-struct termio OriginalConsoleSetting;
+struct termios OriginalConsoleSetting;
 #endif
 
 
@@ -242,7 +242,7 @@ static void Restore(int)
 #elif defined(__APPLE__)
 	ioctl(fileno(stdin),TIOCSETP,&OriginalConsoleSetting);
 #else
-	ioctl(0,TCSETA,&OriginalConsoleSetting);
+	tcsetattr(0, TCSANOW, &OriginalConsoleSetting);
 #endif
 	printf("%s %d\n",__FUNCTION__,__LINE__);
 	exit(0);
@@ -263,14 +263,14 @@ static void FsSetUpInkeyConsole(void)
 	inkey.sg_flags&=~ECHO;
 	ioctl(fileno(stdin),TIOCSETP,&inkey);
 #else
-	struct termio inkey;
-	ioctl(0,TCGETA,&OriginalConsoleSetting);
+	struct termios inkey;
+	tcgetattr(0, &OriginalConsoleSetting);
 	inkey=OriginalConsoleSetting;
 	inkey.c_lflag&=~ECHO;
 	inkey.c_lflag&=~ICANON;
 	inkey.c_cc[VMIN]=0;   /* Zero wait */
 	inkey.c_cc[VTIME]=0;  /* Wait 0 second */
-	ioctl(0,TCSETA,&inkey);
+	tcsetattr(0, TCSANOW, &inkey);
 #endif
 }
 
diff --git a/src/yssocket/src/yssocket.cpp b/src/yssocket/src/yssocket.cpp
index 1066c2de..933023dc 100644
--- a/src/yssocket/src/yssocket.cpp
+++ b/src/yssocket/src/yssocket.cpp
@@ -19,6 +19,7 @@ typedef int socklen_t;
 #else
 #include <unistd.h>
 #include <netdb.h>
+#include <netinet/in.h>
 #include <strings.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
diff --git a/src/yssystemfont/src/linux/ysunixsystemfont.cpp b/src/yssystemfont/src/linux/ysunixsystemfont.cpp
index 7a6c03c8..c736c0df 100644
--- a/src/yssystemfont/src/linux/ysunixsystemfont.cpp
+++ b/src/yssystemfont/src/linux/ysunixsystemfont.cpp
@@ -66,7 +66,7 @@ YsSystemFontCache::InternalData::InternalData()
 	}
 
 	dsp=NULL;
-	rootWin=NULL;
+	rootWin=0;
 	fontSet=NULL;
 
 	dsp=XOpenDisplay(NULL);