[PR PATCH] solaris needs termios.h and __EXTENSIONS__ for TIOCGWINSZ and winsize

[PR PATCH] solaris needs termios.h and __EXTENSIONS__ for TIOCGWINSZ and winsize

[gco]

[-- Attachment #1: Type: text/plain, Size: 398 bytes --]

There is a new pull request by gco against master on the mblaze repository

https://github.com/gco/mblaze solaris
https://github.com/leahneukirchen/mblaze/pull/230

solaris needs termios.h and __EXTENSIONS__ for TIOCGWINSZ and winsize
Address Solaris compile-time issues in mshow and mscan related to TIOCGWINSZ

A patch file from https://github.com/leahneukirchen/mblaze/pull/230.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-solaris-230.patch --]
[-- Type: text/x-diff, Size: 1086 bytes --]

From b6c1da3b3581cf34307d9a4965e625e9d2b80082 Mon Sep 17 00:00:00 2001
From: gco <gco@jazzhaiku.com>
Date: Fri, 10 Jun 2022 20:11:53 -0700
Subject: [PATCH] solaris needs termios.h and __EXTENSIONS__ for TIOCGWINSZ and
 winsize

---
 GNUmakefile | 4 ++++
 mflow.c     | 1 +
 mscan.c     | 1 +
 3 files changed, 6 insertions(+)

diff --git a/GNUmakefile b/GNUmakefile
index 07a0b1a..1ce127e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -14,6 +14,10 @@ ifeq ($(OS),Darwin)
 LDLIBS=-liconv
 endif
 
+ifeq ($(OS),SunOS)
+override CFLAGS+=-D__EXTENSIONS__
+endif
+
 DESTDIR=
 PREFIX=/usr/local
 BINDIR=$(PREFIX)/bin
diff --git a/mflow.c b/mflow.c
index 9bed19d..2bfedf0 100644
--- a/mflow.c
+++ b/mflow.c
@@ -9,6 +9,7 @@
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
+#include <termios.h>
 
 #include "blaze822.h"
 #include "xpledge.h"
diff --git a/mscan.c b/mscan.c
index 52ba9a4..8d8a498 100644
--- a/mscan.c
+++ b/mscan.c
@@ -19,6 +19,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <wchar.h>
+#include <termios.h>
 
 #include "blaze822.h"
 #include "u8decode.h"

Re: solaris needs termios.h and __EXTENSIONS__ for TIOCGWINSZ and winsize

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New comment by leahneukirchen on mblaze repository

https://github.com/leahneukirchen/mblaze/pull/230#issuecomment-1159563269

Comment:
Would be clearer to define __EXTENSIONS__ guarded by `ifdef __sun` or so?

Re: solaris needs termios.h and __EXTENSIONS__ for TIOCGWINSZ and winsize

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New comment by leahneukirchen on mblaze repository

https://github.com/leahneukirchen/mblaze/pull/230#issuecomment-1159563269

Comment:
Would be clearer to define `__EXTENSIONS__` inline where needed, guarded by `ifdef __sun` or so?

Re: [PR PATCH] [Updated] solaris needs termios.h and __EXTENSIONS__ for TIOCGWINSZ and winsize

[gco]

[-- Attachment #1: Type: text/plain, Size: 411 bytes --]

There is an updated pull request by gco against master on the mblaze repository

https://github.com/gco/mblaze-solaris solaris
https://github.com/leahneukirchen/mblaze/pull/230

solaris needs termios.h and __EXTENSIONS__ for TIOCGWINSZ and winsize
Address Solaris compile-time issues in mshow and mscan related to TIOCGWINSZ

A patch file from https://github.com/leahneukirchen/mblaze/pull/230.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-solaris-230.patch --]
[-- Type: text/x-diff, Size: 1087 bytes --]

From ee262635898e70f59abd48385342a601533b7004 Mon Sep 17 00:00:00 2001
From: gco <gco@jazzhaiku.com>
Date: Fri, 10 Jun 2022 20:11:53 -0700
Subject: [PATCH] solaris needs termios.h and __EXTENSIONS__ for TIOCGWINSZ and
 winsize

---
 mflow.c | 5 +++++
 mscan.c | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/mflow.c b/mflow.c
index 9bed19d..5ba925e 100644
--- a/mflow.c
+++ b/mflow.c
@@ -1,3 +1,7 @@
+#ifdef __sun
+#define __EXTENSIONS__ /* to get TIOCGWINSZ */
+#endif
+
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 
@@ -9,6 +13,7 @@
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
+#include <termios.h>
 
 #include "blaze822.h"
 #include "xpledge.h"
diff --git a/mscan.c b/mscan.c
index 52ba9a4..0494409 100644
--- a/mscan.c
+++ b/mscan.c
@@ -1,6 +1,9 @@
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 700
 #endif
+#ifdef __sun
+#define __EXTENSIONS__ /* to get TIOCGWINSZ */
+#endif
 
 #include "xpledge.h"
 
@@ -19,6 +22,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <wchar.h>
+#include <termios.h>
 
 #include "blaze822.h"
 #include "u8decode.h"

Re: solaris needs termios.h and __EXTENSIONS__ for TIOCGWINSZ and winsize

[gco]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

New comment by gco on mblaze repository

https://github.com/leahneukirchen/mblaze/pull/230#issuecomment-1159819040

Comment:
Done, but it duplicates the CFLAGS in two locations.

Re: [PR PATCH] [Merged]: solaris needs termios.h and __EXTENSIONS__ for TIOCGWINSZ and winsize

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 267 bytes --]

There's a merged pull request on the mblaze repository

solaris needs termios.h and __EXTENSIONS__ for TIOCGWINSZ and winsize
https://github.com/leahneukirchen/mblaze/pull/230

Description:
Address Solaris compile-time issues in mshow and mscan related to TIOCGWINSZ