[Nickle] nickle: Branch 'master' - 2 commits

[Keith Packard]

 complex.c        |    4 ++--
 debian/changelog |    6 ++++++
 meson.build      |    2 +-
 value.h          |    4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit e3e11e9d67baed30034780ebc7fe385bdb4d9f40
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Oct 10 11:51:47 2025 -0700

    Version 2.106
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/debian/changelog b/debian/changelog
index c840dd1..f65eda5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nickle (2.106) unstable; urgency=medium
+
+  * Rename Complex as ComplexVal. Closes: #1117746.
+
+ -- Keith Packard <keithp at keithp.com>  Fri, 10 Oct 2025 11:20:32 -0700
+
 nickle (2.105) unstable; urgency=medium
 
   * Add more math functions
diff --git a/meson.build b/meson.build
index e699e88..dba668b 100644
--- a/meson.build
+++ b/meson.build
@@ -12,7 +12,7 @@ project('nickle', 'c',
 	],
 	license : 'BSD',
 	meson_version : '>= 1.0',
-	version: '2.105'
+	version: '2.106'
        )
 
 release_date = '2025-10-05'
commit aa1c340248e1b5cba10b5b421db38b7371b79e40
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Oct 10 11:48:48 2025 -0700

    Rename 'Complex' type to 'ComplexVal' to avoid collision with X11
    
    X11 defines Complex as 0, so if you include X11 and nickle headers at
    the same time (as cairo-5c does), you get a compile error.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/complex.c b/complex.c
index 1f11e73..b7c962a 100644
--- a/complex.c
+++ b/complex.c
@@ -157,7 +157,7 @@ ComplexHash (Value av)
 static void
 ComplexMark (void *object)
 {
-    Complex	*c = object;
+    ComplexVal	*c = object;
 
     MemReference(c->r);
     MemReference(c->i);
@@ -196,7 +196,7 @@ NewComplex (Value r, Value i)
     ENTER();
     Value	ret;
 
-    ret = ALLOCATE (&ComplexRep.data, sizeof (Complex));
+    ret = ALLOCATE (&ComplexRep.data, sizeof (ComplexVal));
     ret->complex.r = r;
     ret->complex.i = i;
     RETURN (ret);
diff --git a/value.h b/value.h
index 6e8291f..5156aff 100644
--- a/value.h
+++ b/value.h
@@ -602,7 +602,7 @@ typedef struct _float {
 typedef struct _complex {
     BaseValue	base;
     Value	r, i;
-} Complex;
+} ComplexVal;
 
 typedef struct _string {
     BaseValue	    base;
@@ -895,7 +895,7 @@ typedef union _value {
     Integer	integer;
     Rational	rational;
     Float	floats;
-    Complex	complex;
+    ComplexVal	complex;
     String	string;
     Array	array;
     File	file;