From cfdc60104b8487be153541697df476ca84598e4a Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Wed, 17 Nov 2021 12:05:01 -0500
Subject: [PATCH] Updated version to go along with the merge of pull request
 #39 from Kamyar Mohajerani, with a few minor edits such as renaming my_hash
 to hashcase, as a better counterpoint to "hashnocase".

---
 VERSION        | 2 +-
 base/ext.c     | 4 ++--
 base/hash.c    | 2 +-
 base/hash.h    | 2 +-
 base/netcmp.c  | 4 ++--
 base/objlist.c | 2 +-
 base/verilog.c | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/VERSION b/VERSION
index 2593151..bca61d4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.209
+1.5.210
diff --git a/base/ext.c b/base/ext.c
index f47c032..1774512 100644
--- a/base/ext.c
+++ b/base/ext.c
@@ -187,7 +187,7 @@ char *ReadExt(char *fname, int doflat, int *fnum)
   /* Make sure all .ext file reading is case sensitive */
   matchfunc = match;
   matchintfunc = matchfile;
-  hashfunc = my_hash;
+  hashfunc = hashcase;
 
   if (LookupCellFile(fname, filenum) != NULL) {
     Printf("Error:  Duplicate cell name \"%s\"!\n", fname);
@@ -653,7 +653,7 @@ char *ReadSim(char *fname, int *fnum)
   /* Make sure all .sim file reading is case sensitive */
   matchfunc = match;
   matchintfunc = matchfile;
-  hashfunc = my_hash;
+  hashfunc = hashcase;
 
   CellDef(fname, filenum);
 
diff --git a/base/hash.c b/base/hash.c
index 40a2a84..31c8245 100644
--- a/base/hash.c
+++ b/base/hash.c
@@ -148,7 +148,7 @@ unsigned long hashnocase(char *s, int hashsize)
 	return (hashsize == 0) ? hashval : (hashval % hashsize);
 }
 
-unsigned long my_hash(char *s, int hashsize)
+unsigned long hashcase(char *s, int hashsize)
 {
 	unsigned long hashval;
 	
diff --git a/base/hash.h b/base/hash.h
index 087e90e..4007a3e 100644
--- a/base/hash.h
+++ b/base/hash.h
@@ -48,7 +48,7 @@ extern void *HashFirst(struct hashdict *dict);
 extern void *HashNext(struct hashdict *dict);
 
 extern unsigned long hashnocase(char *s, int hashsize);
-extern unsigned long my_hash(char *s, int hashsize);
+extern unsigned long hashcase(char *s, int hashsize);
 
 extern int (*matchfunc)(char *, char *);
 /* matchintfunc() compares based on the name and the first	*/
diff --git a/base/netcmp.c b/base/netcmp.c
index 4430e51..9161dbb 100644
--- a/base/netcmp.c
+++ b/base/netcmp.c
@@ -37,7 +37,6 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #ifdef TCL_NETGEN
 #include <tcl.h>
-int check_interrupt();
 #endif
 
 #include "netgen.h"
@@ -54,6 +53,7 @@ int check_interrupt();
 int InterruptPending = 0;
 void (*oldinthandler)() = SIG_DFL;
 extern Tcl_Interp *netgeninterp;
+extern int check_interrupt();
 #endif
 
 /* define the following to debug core allocation */
@@ -3761,7 +3761,7 @@ void CreateTwoLists(char *name1, int file1, char *name2, int file2, int dolist)
     /* determine if matching will be case sensitive or case insensitive */
     matchfunc = match;
     matchintfunc = matchfile;
-    hashfunc = my_hash;
+    hashfunc = hashcase;
     if (tc1 != NULL && tc2 != NULL) {
         if ((tc1->flags & CELL_NOCASE) && (tc2->flags & CELL_NOCASE)) {
 	   matchfunc = matchnocase;
diff --git a/base/objlist.c b/base/objlist.c
index 23a59dd..9b2236b 100644
--- a/base/objlist.c
+++ b/base/objlist.c
@@ -289,7 +289,7 @@ static struct hashdict cell_dict;
 
 void InitCellHashTable(void)
 {
-    hashfunc = my_hash;
+    hashfunc = hashcase;
     matchfunc = NULL;
     matchintfunc = matchfile;
     InitializeHashTable(&cell_dict, CELLHASHSIZE);
diff --git a/base/verilog.c b/base/verilog.c
index 5b92a90..b8d8b11 100644
--- a/base/verilog.c
+++ b/base/verilog.c
@@ -2239,7 +2239,7 @@ char *ReadVerilogTop(char *fname, int *fnum, int blackbox)
   else {
      matchfunc = match;
      matchintfunc = matchfile;
-     hashfunc = my_hash;
+     hashfunc = hashcase;
   }
 
   InitializeHashTable(&verilogparams, OBJHASHSIZE);