From 85e7328d525bb152b14aa63aa21168c5c4f742d8 Mon Sep 17 00:00:00 2001
From: Denis Kozadaev <denis@dilos.org>
Date: Mon, 29 May 2023 20:46:56 +0300
Subject: [PATCH] SunOS cosmetic changes

Signed-off-by: Denis Kozadaev <denis@dilos.org>
---
 .../protocols/jabber/jingle/libjingle/talk/base/network.cpp | 3 +++
 kppp/kpppconfig.h                                           | 6 +++---
 krfb/krfb/rfbcontroller.cpp                                 | 2 +-
 ktalkd/ktalkd/find_user.cpp                                 | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cpp b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cpp
index 21b3a08f..1b3a281e 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cpp
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cpp
@@ -45,6 +45,9 @@ extern "C" {
 #include <net/if.h>
 #include <unistd.h>
 #include <errno.h>
+#ifdef Q_OS_SOLARIS
+#include <sys/sockio.h>
+#endif /* solaris */
 }
 #endif // POSIX
 
diff --git a/kppp/kpppconfig.h b/kppp/kpppconfig.h
index 4c1d9320..1fdf43d3 100644
--- a/kppp/kpppconfig.h
+++ b/kppp/kpppconfig.h
@@ -26,11 +26,11 @@
 #ifndef _KPPPCONFIG_H_
 #define _KPPPCONFIG_H_
 
-#if defined(__svr4__)
+#ifdef Q_OS_SOLARIS
 #define STREAMS
-#define _XOPEN_SOURCE 1
+#define _XOPEN_SOURCE 600
 #define _XOPEN_SOURCE_EXTENDED 1
-#define __EXTENSIONS__
+#define __EXTENSIONS__ 1
 #endif
 
 #include <config.h>
diff --git a/krfb/krfb/rfbcontroller.cpp b/krfb/krfb/rfbcontroller.cpp
index 2e14837b..fe6aee94 100644
--- a/krfb/krfb/rfbcontroller.cpp
+++ b/krfb/krfb/rfbcontroller.cpp
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#ifdef USE_SOLARIS
+#ifdef Q_OS_SOLARIS
 #include <strings.h>
 #endif
 
diff --git a/ktalkd/ktalkd/find_user.cpp b/ktalkd/ktalkd/find_user.cpp
index 4cca8b22..54e7469d 100644
--- a/ktalkd/ktalkd/find_user.cpp
+++ b/ktalkd/ktalkd/find_user.cpp
@@ -375,8 +375,8 @@ int find_user(char *name, char *tty, char *disp) {
 #ifdef USE_UT_HOST
                         if (Options.debug_mode) {
                             syslog(LOG_DEBUG, "I wanna this:%s", ttyFound);
-                            syslog(LOG_DEBUG, "ut_host=%s", ubuf.ut_host);
-                            syslog(LOG_DEBUG, "%s", ubuf.ut_line);
+                            syslog(LOG_DEBUG, "ut_host=%s", ubuf->ut_host);
+                            syslog(LOG_DEBUG, "%s", ubuf->ut_line);
                         }
 #endif
                         break;