libXmu: Branch 'master' - 5 commits

[GitLab Mirror]

 configure.ac          |    2 +-
 include/X11/Xmu/Xmu.h |    2 --
 src/Clip.c            |    2 --
 src/CvtStdSel.c       |   19 +++----------------
 4 files changed, 4 insertions(+), 21 deletions(-)

New commits:
commit 117f425f68a087c833ee5ad17e3b17094360b184
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Feb 17 13:45:24 2024 -0800

    Use XtAsprintf to simplify os_name string generation
    
    Raises minimum libXt requirement to 1.1.0
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/configure.ac b/configure.ac
index ce7ace2..2a929b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ XORG_WITH_XSLTPROC
 XORG_CHECK_SGML_DOCTOOLS(1.8)
 
 # Obtain compiler/linker options for dependencies
-PKG_CHECK_MODULES(XMU, xt xext x11 xextproto)
+PKG_CHECK_MODULES(XMU, [xt >= 1.1 xext x11 xextproto])
 PKG_CHECK_MODULES(XMUU, x11)
 
 # Checks for library functions.
diff --git a/src/CvtStdSel.c b/src/CvtStdSel.c
index 7af31c8..6dfe7ca 100644
--- a/src/CvtStdSel.c
+++ b/src/CvtStdSel.c
@@ -94,12 +94,8 @@ get_os_name(void)
 
 	if (uname (&utss) >= 0) {
 	    char *os_name;
-	    int len = strlen(utss.sysname) + 1;
-	    len += 2 + strlen(utss.release);
-	    os_name = XtMalloc (len);
-	    strcpy (os_name, utss.sysname);
-	    strcat (os_name, " ");
-	    strcat (os_name, utss.release);
+
+	    XtAsprintf(&os_name, "%s %s", utss.sysname, utss.release);
 	    return os_name;
 	}
 #endif
commit 1c4827041087c539af3261b6947b2fd4db26f9d7
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Feb 17 13:35:29 2024 -0800

    unifdef SYSV
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/src/CvtStdSel.c b/src/CvtStdSel.c
index 9c017c4..7af31c8 100644
--- a/src/CvtStdSel.c
+++ b/src/CvtStdSel.c
@@ -127,7 +127,7 @@ get_os_name(void)
 	}
 #endif
 
-#if !defined(SYSV) && (defined(CSRG_BASED) || defined(unix))
+#ifdef CSRG_BASED
 	return XtNewString("BSD");
 #else
 	return NULL;
commit 7d3ce8808355a1850620dd290a0e5a7cf7a583fe
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Feb 17 13:32:59 2024 -0800

    Remove "#ifndef notdef" checks
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/include/X11/Xmu/Xmu.h b/include/X11/Xmu/Xmu.h
index e49ad6f..6048415 100644
--- a/include/X11/Xmu/Xmu.h
+++ b/include/X11/Xmu/Xmu.h
@@ -107,11 +107,9 @@ XmuScanline *XmuNewScanline(int, int, int);
 void XmuDestroyScanlineList(XmuScanline*);
 XmuArea *XmuOptimizeArea(XmuArea *area);
 
-#ifndef notdef
 XmuScanline *XmuScanlineOrSegment(XmuScanline*, XmuSegment*);
 XmuScanline *XmuScanlineAndSegment(XmuScanline*, XmuSegment*);
 XmuScanline *XmuScanlineXorSegment(XmuScanline*, XmuSegment*);
-#endif /* notdef */
 
 #ifndef _SYSUTIL_H_
 int XmuSnprintf(char *str, int size, _Xconst char *fmt, ...)
diff --git a/src/Clip.c b/src/Clip.c
index ae9e132..d670d0b 100644
--- a/src/Clip.c
+++ b/src/Clip.c
@@ -849,7 +849,6 @@ XmuScanlineNot(XmuScanline *scanline, int minx, int maxx)
 }
 
 
-#ifndef notdef
 /*
  * Function:
  *	XmuScanlineOrSegment
@@ -1116,7 +1115,6 @@ XmuScanlineXorSegment(XmuScanline *dst, XmuSegment *src)
 
   return (dst);
 }
-#endif /* notdef */
 
 /*
  * Function:
commit c85d4dd1eca410bd1b97823ebde88de85a665ca7
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Feb 17 13:30:14 2024 -0800

    unifdef Lynx
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/src/CvtStdSel.c b/src/CvtStdSel.c
index b08291b..9c017c4 100644
--- a/src/CvtStdSel.c
+++ b/src/CvtStdSel.c
@@ -47,12 +47,7 @@ in this Software without prior written authorization from The Open Group.
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #else
-#ifndef Lynx
 #include <sys/socket.h>
-#else
-#include <sys/types.h>
-#include <socket.h>
-#endif
 #define XOS_USE_XT_LOCKING
 #endif
 #include <X11/Xos_r.h>
commit e0c9afd60eaa2209930e7a93f1d27d219a790e80
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Feb 17 13:29:09 2024 -0800

    unifdef hpux
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/src/CvtStdSel.c b/src/CvtStdSel.c
index 8a1b05d..b08291b 100644
--- a/src/CvtStdSel.c
+++ b/src/CvtStdSel.c
@@ -100,15 +100,11 @@ get_os_name(void)
 	if (uname (&utss) >= 0) {
 	    char *os_name;
 	    int len = strlen(utss.sysname) + 1;
-#ifndef hpux				/* because of hostname length crock */
 	    len += 2 + strlen(utss.release);
-#endif
 	    os_name = XtMalloc (len);
 	    strcpy (os_name, utss.sysname);
-#ifndef hpux
 	    strcat (os_name, " ");
 	    strcat (os_name, utss.release);
-#endif
 	    return os_name;
 	}
 #endif