From 2519d0a4d81d21034b41d19a46fd092676c8eec1 Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Fri, 11 Nov 2022 11:20:34 -0500
Subject: [PATCH] Corrected an issue with readline that breaks the non-Tcl/Tk
 flow due to a missing function prototype.  Modified the GDS output flow to
 always output instance IDs as a property, not just in the non-default case. 
 The property has been used for many years and appears to be accepted by all
 tools reading GDS, so there is no downside to always generating this output. 
 This has the upside that default instance names don't get scrambled by going
 from magic to GDS and back to magic.

---
 VERSION                         |  2 +-
 calma/CalmaWrite.c              | 10 ++++------
 calma/CalmaWriteZ.c             | 10 ++++------
 readline/readline-4.3/display.c |  3 +++
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/VERSION b/VERSION
index 5936d050..f248c753 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.339
+8.3.340
diff --git a/calma/CalmaWrite.c b/calma/CalmaWrite.c
index 0a8297e7..1507a235 100644
--- a/calma/CalmaWrite.c
+++ b/calma/CalmaWrite.c
@@ -1605,13 +1605,11 @@ calmaWriteUseFunc(use, f)
 	/* By NP */
 	/* Property attributes/value pairs. */
 	/* Add a CellUse ID property, if the CellUse has a non-default name */
+	/* (Modified 11/11/2022:  Do this always, not just the non-default case) */
 
-	if (!calmaIsUseNameDefault(use->cu_def->cd_name, use->cu_id))
-	{
-	    calmaOutRH(6, CALMA_PROPATTR, CALMA_I2, f);
-	    calmaOutI2(CALMA_PROP_USENAME_STD, f);
-	    calmaOutStringRecord(CALMA_PROPVALUE, use->cu_id, f);
-	}
+	calmaOutRH(6, CALMA_PROPATTR, CALMA_I2, f);
+	calmaOutI2(CALMA_PROP_USENAME_STD, f);
+	calmaOutStringRecord(CALMA_PROPVALUE, use->cu_id, f);
 
 	/* Add an array limits property, if the CellUse is an array and */
 	/* limits of the array (xlo, ylo) are not zero (the default).	*/
diff --git a/calma/CalmaWriteZ.c b/calma/CalmaWriteZ.c
index 8ceb54cf..52f713f8 100644
--- a/calma/CalmaWriteZ.c
+++ b/calma/CalmaWriteZ.c
@@ -1472,13 +1472,11 @@ calmaWriteUseFuncZ(use, f)
 	/* By NP */
 	/* Property attributes/value pairs. */
 	/* Add a CellUse ID property, if the CellUse has a non-default name */
+	/* (Modified 11/11/2022:  Do this always, not just the non-default case) */
 
-	if (!calmaIsUseNameDefault(use->cu_def->cd_name, use->cu_id))
-	{
-	    calmaOutRHZ(6, CALMA_PROPATTR, CALMA_I2, f);
-	    calmaOutI2Z(CALMA_PROP_USENAME_STD, f);
-	    calmaOutStringRecordZ(CALMA_PROPVALUE, use->cu_id, f);
-	}
+	calmaOutRHZ(6, CALMA_PROPATTR, CALMA_I2, f);
+	calmaOutI2Z(CALMA_PROP_USENAME_STD, f);
+	calmaOutStringRecordZ(CALMA_PROPVALUE, use->cu_id, f);
 
 	/* Add an array limits property, if the CellUse is an array and */
 	/* limits of the array (xlo, ylo) are not zero (the default).	*/
diff --git a/readline/readline-4.3/display.c b/readline/readline-4.3/display.c
index 3c654963..83f12f26 100644
--- a/readline/readline-4.3/display.c
+++ b/readline/readline-4.3/display.c
@@ -41,6 +41,9 @@
 
 #include <stdio.h>
 
+#define _XOPEN_SOURCE       /* See feature_test_macros(7) */
+#include <wchar.h>
+
 /* System-specific feature definitions and include files. */
 #include "rldefs.h"
 #include "rlmbutil.h"