Attachment 1942537 Details for Bug 2167380 – Start of a C99 port

[patch] Start of a C99 port

netgen-c99.patch (text/plain), 7.53 KB, created by Florian Weimer on 2023-02-06 13:13:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Weimer

Created: 2023-02-06 13:13:28 UTC

Size: 7.53 KB

patch

obsolete

>diff --git a/netgen-1.3.7/base/embed.c b/netgen-1.3.7/base/embed.c
>index 0113c163e9ffb396..ecc0d728be18cb70 100644
>--- a/netgen-1.3.7/base/embed.c
>+++ b/netgen-1.3.7/base/embed.c
>@@ -27,9 +27,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
> #include "config.h"
> 
> #include <stdio.h>
>-#ifdef IBMPC
> #include <stdlib.h>
>-#endif
> 
> #include "netgen.h"
> #include "hash.h"
>diff --git a/netgen-1.3.7/base/ext.c b/netgen-1.3.7/base/ext.c
>index 1efee796fd80fbcc..59f1268baa6454c3 100644
>--- a/netgen-1.3.7/base/ext.c
>+++ b/netgen-1.3.7/base/ext.c
>@@ -22,11 +22,14 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
> 
> #include <stdio.h>
> #include <stdarg.h>
>+#include <stdlib.h>
>+#include <ctype.h>
> 
> #include "netgen.h"
> #include "hash.h"
> #include "objlist.h"
> #include "netfile.h"
>+#include "netgen.h"
> #include "print.h"
> 
> void extCell(char *name)
>diff --git a/netgen-1.3.7/base/flatten.c b/netgen-1.3.7/base/flatten.c
>index ff0673b969954fc6..2c39c9e781cb16f7 100644
>--- a/netgen-1.3.7/base/flatten.c
>+++ b/netgen-1.3.7/base/flatten.c
>@@ -24,6 +24,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
> #include "config.h"
> 
> #include <stdio.h>
>+#include <stdlib.h>
> 
> #ifdef IBMPC
> #include <alloc.h>
>diff --git a/netgen-1.3.7/base/hash.c b/netgen-1.3.7/base/hash.c
>index 8484749af51a5370..58ec9c342939cbb5 100644
>--- a/netgen-1.3.7/base/hash.c
>+++ b/netgen-1.3.7/base/hash.c
>@@ -21,6 +21,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
> #include "config.h"
> 
> #include <stdio.h>
>+#include <stdlib.h>
> #ifdef IBMPC
> #include <alloc.h>
> #endif
>diff --git a/netgen-1.3.7/base/netcmp.c b/netgen-1.3.7/base/netcmp.c
>index 6528f871cdad161e..fc39c8b8bc4e2a98 100644
>--- a/netgen-1.3.7/base/netcmp.c
>+++ b/netgen-1.3.7/base/netcmp.c
>@@ -25,11 +25,11 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
> #include <signal.h>
> #include <time.h>    /* for time() as a seed for random number generator */
> #include <limits.h>
>+#include <stdlib.h>
> 
> #ifdef IBMPC
> #include <alloc.h>
> #include <process.h>  /* for exit() */
>-/* #include <stdlib.h>   for rand(), srand() */
> #endif
> 
> #include "netgen.h"
>diff --git a/netgen-1.3.7/base/netfile.c b/netgen-1.3.7/base/netfile.c
>index 02dc6d19a2e92fb2..1c07d4a8877795c9 100644
>--- a/netgen-1.3.7/base/netfile.c
>+++ b/netgen-1.3.7/base/netfile.c
>@@ -25,9 +25,8 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
> #include <stdarg.h>
> #include <ctype.h>
> #include <sys/fcntl.h> /* for SGI */
>-#ifdef IBMPC
> #include <stdlib.h>   /* for calloc */
>-#endif
>+#include <unistd.h>
> 
> #include "netgen.h"
> #include "hash.h"
>diff --git a/netgen-1.3.7/base/netgen.c b/netgen-1.3.7/base/netgen.c
>index 8a918959155ac996..6b509018af2d1af9 100644
>--- a/netgen-1.3.7/base/netgen.c
>+++ b/netgen-1.3.7/base/netgen.c
>@@ -24,6 +24,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
> 
> #include <stdio.h>
> #include <stdarg.h>
>+#include <stdlib.h>
> /*  #include <ctype.h>*/ /* toupper */
> #ifdef IBMPC
> #include <alloc.h>
>diff --git a/netgen-1.3.7/base/netgen.h b/netgen-1.3.7/base/netgen.h
>index 417f7bff721a7a91..a6bcd33e1390b115 100644
>--- a/netgen-1.3.7/base/netgen.h
>+++ b/netgen-1.3.7/base/netgen.h
>@@ -42,7 +42,9 @@ extern void Place(char *name);
> extern void Array(char *Cell, int num);
> extern void ActelLib(void);
> extern void Flatten(char *name);
>+extern void flattenCell(char *name);
> extern void FlattenInstancesOf(char *classname);
>+extern void flattenInstancesOf(char *name, char *instance);
> extern void ConnectAllNodes(char *classname);
> extern int  NoDisconnectedNodes;
> 
>@@ -54,7 +56,7 @@ extern void CellCopy(char *from, char *to);
> extern int Debug;
> extern int VerboseOutput; /* set this to 1 to enable extra output */
> extern int IgnoreRC;	  /* set this to 1 to ignore capacitance and resistance */
>-extern int NoOutput;      /* set this to 1 to disable stdout output */
>+extern int NoOutput;      /* set this to 1 to dbisable stdout output */
> extern int Composition;	  /* direction of composition */
> extern int UnixWildcards; /* TRUE if *,?,{},[] only; false if full REGEXP */
> /* magic internal flag to restrict searches to recently placed cells */
>diff --git a/netgen-1.3.7/base/ntk.c b/netgen-1.3.7/base/ntk.c
>index abef5dd1004a1d0a..f222d8b93d2497f0 100644
>--- a/netgen-1.3.7/base/ntk.c
>+++ b/netgen-1.3.7/base/ntk.c
>@@ -26,6 +26,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
> 
> #include <stdio.h>
> #include <stdarg.h>
>+#include <stdlib.h>
> 
> #include "netgen.h"
> #include "hash.h"
>diff --git a/netgen-1.3.7/base/objlist.c b/netgen-1.3.7/base/objlist.c
>index d1eb7d2c521dcadb..1bdd64c0b09ad416 100644
>--- a/netgen-1.3.7/base/objlist.c
>+++ b/netgen-1.3.7/base/objlist.c
>@@ -21,6 +21,9 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
> #include "config.h"
> 
> #include <stdio.h>
>+#include <stdlib.h>
>+#include <ctype.h>
>+
> #ifdef IBMPC
> #include <alloc.h>
> #endif
>diff --git a/netgen-1.3.7/base/place.c b/netgen-1.3.7/base/place.c
>index 4178e9a292b70ce7..0bdd79c1b3f29524 100644
>--- a/netgen-1.3.7/base/place.c
>+++ b/netgen-1.3.7/base/place.c
>@@ -38,6 +38,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
> #include <setjmp.h>
> #include <signal.h>
> #include <ctype.h>
>+#include <stdlib.h>
> 
> #include "netgen.h"
> #include "hash.h"
>diff --git a/netgen-1.3.7/base/query.c b/netgen-1.3.7/base/query.c
>index 95be1aa77ed26f5b..5e3b236f7235a3b7 100644
>--- a/netgen-1.3.7/base/query.c
>+++ b/netgen-1.3.7/base/query.c
>@@ -24,6 +24,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
> #include <ctype.h>
> #include <setjmp.h>
> #include <signal.h>
>+#include <stdlib.h>
> 
> #ifdef HAVE_MALLINFO
> #include <malloc.h>
>diff --git a/netgen-1.3.7/base/spice.c b/netgen-1.3.7/base/spice.c
>index 66fe24f8d0efd89b..3eccccd095825a0b 100644
>--- a/netgen-1.3.7/base/spice.c
>+++ b/netgen-1.3.7/base/spice.c
>@@ -25,9 +25,8 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
> #include <stdarg.h>  /* what about varargs, like in pdutils.c ??? */
> #endif
> 
>-#ifdef IBMPC
> #include <stdlib.h>  /* for calloc(), free() */
>-#endif
>+#include <ctype.h>
> 
> #include "netgen.h"
> #include "hash.h"
>diff --git a/netgen-1.3.7/base/xilinx.c b/netgen-1.3.7/base/xilinx.c
>index f933b535585e1b7b..fab58a14184f5764 100644
>--- a/netgen-1.3.7/base/xilinx.c
>+++ b/netgen-1.3.7/base/xilinx.c
>@@ -23,10 +23,8 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
> #include <stdio.h>
> #include <stdarg.h>
> #include <ctype.h>
>-
>-#ifdef IBMPC
>+#include <time.h>
> #include <stdlib.h>  /* for strtol on PC */
>-#endif
> 
> #include "netgen.h"
> #include "objlist.h"
>@@ -132,7 +130,10 @@ char *xilinx_class(classname)
> 	}
> 	return(classname);
> }
>-Xilinx(cellname, filename)
>+
>+static void xilinxCell(char *cell);
>+
>+void Xilinx(cellname, filename)
> 	char *cellname;
> 	char *filename;
> {
>@@ -162,8 +163,7 @@ Xilinx(cellname, filename)
> 	CloseFile(FileName);
> }
> 
>-xilinxCell(cell)
>-	char *cell;
>+static void xilinxCell(char *cell)
> {
> 	struct nlist *nl;
> 	struct objlist *ob;
>@@ -233,6 +233,8 @@ xilinxCell(cell)
> }
> 
> 
>+static void xilinx_sym(struct nlist *nl, struct objlist *gob);
>+
> struct objlist *xilinx_gate(ob,nl)
> 	struct objlist *ob;
> 	struct nlist *nl;
>@@ -252,9 +254,8 @@ struct objlist *xilinx_gate(ob,nl)
> 	return(nob);
> }
> 
>-xilinx_sym(nl,gob)
>-	struct nlist *nl;
>-	struct objlist *gob;
>+static void
>+xilinx_sym(struct nlist *nl, struct objlist *gob)
> {
> 	struct objlist *ob;
> 	char *cp,*rindex();

Actions: View | Diff

Attachments on bug 2167380: 1942537