Make configure detect malloc.h

steveicarus · Sep 15, 2001 · b2b8b89 · b2b8b89
1 parent 92760f2
commit b2b8b89
Show file tree

Hide file tree

Showing 36 changed files with 207 additions and 34 deletions.
diff --git a/config.h.in b/config.h.in
@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: config.h.in,v 1.1 2001/07/25 03:10:48 steve Exp $"
+#ident "$Id: config.h.in,v 1.2 2001/09/15 18:27:04 steve Exp $"
 #endif
 
 #if defined(__cplusplus)
@@ -37,13 +37,17 @@
 # undef HAVE_TIMES
 # undef HAVE_IOSFWD
 # undef HAVE_GETOPT_H
+# undef HAVE_MALLOC_H
 # undef HAVE_DLFCN_H
 # undef HAVE_DL_H
 # undef HAVE_FCHMOD
 # undef HAVE_LIBREADLINE
 
 /*
  * $Log: config.h.in,v $
+ * Revision 1.2  2001/09/15 18:27:04  steve
+ *  Make configure detect malloc.h
+ *
  * Revision 1.1  2001/07/25 03:10:48  steve
  *  Create a config.h.in file to hold all the config
  *  junk, and support gcc 3.0. (Stephan Boettcher)

diff --git a/configure.in b/configure.in
@@ -16,7 +16,7 @@ fi
 
 AC_LANG_CPLUSPLUS
 
-AC_CHECK_HEADERS(getopt.h iosfwd sys/wait.h)
+AC_CHECK_HEADERS(getopt.h malloc.h iosfwd sys/wait.h)
 
 AC_MSG_CHECKING(for sys/times)
 AC_TRY_LINK(

diff --git a/driver/parse.y b/driver/parse.y
@@ -18,13 +18,16 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: parse.y,v 1.3 2001/07/25 03:10:50 steve Exp $"
+#ident "$Id: parse.y,v 1.4 2001/09/15 18:27:04 steve Exp $"
 #endif
 
 # include "config.h"
 
 # include  <stdio.h>
+#ifdef HAVE_MALLOC_H
 # include  <malloc.h>
+#endif
+# include  <stdlib.h>
 # include  "globals.h"
 
 

diff --git a/ivlpp/lexor.lex b/ivlpp/lexor.lex
@@ -19,13 +19,16 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: lexor.lex,v 1.24 2001/07/25 03:10:50 steve Exp $"
+#ident "$Id: lexor.lex,v 1.25 2001/09/15 18:27:04 steve Exp $"
 #endif
 
 # include "config.h"
 
 # include  <stdio.h>
+#ifdef HAVE_MALLOC_H
 # include  <malloc.h>
+#endif
+# include  <stdlib.h>
 # include  <string.h>
 # include  <assert.h>
 

diff --git a/ivlpp/main.c b/ivlpp/main.c
@@ -17,7 +17,7 @@ const char COPYRIGHT[] =
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: main.c,v 1.11 2001/07/25 03:10:50 steve Exp $"
+#ident "$Id: main.c,v 1.12 2001/09/15 18:27:04 steve Exp $"
 #endif
 
 # include "config.h"
@@ -42,7 +42,9 @@ const char VERSION[] = "$Name:  $ $State: Exp $";
 
 # include  <stdio.h>
 # include  <stdlib.h>
+#ifdef HAVE_MALLOC_H
 # include  <malloc.h>
+#endif
 # include  <unistd.h>
 # include  <string.h>
 #if defined(HAVE_GETOPT_H)
@@ -186,6 +188,9 @@ int main(int argc, char*argv[])
 
 /*
  * $Log: main.c,v $
+ * Revision 1.12  2001/09/15 18:27:04  steve
+ *  Make configure detect malloc.h
+ *
  * Revision 1.11  2001/07/25 03:10:50  steve
  *  Create a config.h.in file to hold all the config
  *  junk, and support gcc 3.0. (Stephan Boettcher)

diff --git a/t-dll-expr.cc b/t-dll-expr.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) & !defined(macintosh)
-#ident "$Id: t-dll-expr.cc,v 1.17 2001/07/27 04:51:44 steve Exp $"
+#ident "$Id: t-dll-expr.cc,v 1.18 2001/09/15 18:27:04 steve Exp $"
 #endif
 
 # include "config.h"
@@ -27,7 +27,10 @@
 # include  "t-dll.h"
 # include  "netlist.h"
 # include  <assert.h>
+#ifdef HAVE_MALLOC_H
 # include  <malloc.h>
+#endif
+# include  <stdlib.h>
 
 /*
  * These methods implement the expression scan that generates the
@@ -298,6 +301,9 @@ void dll_target::expr_unary(const NetEUnary*net)
 
 /*
  * $Log: t-dll-expr.cc,v $
+ * Revision 1.18  2001/09/15 18:27:04  steve
+ *  Make configure detect malloc.h
+ *
  * Revision 1.17  2001/07/27 04:51:44  steve
  *  Handle part select expressions as variants of
  *  NetESignal/IVL_EX_SIGNAL objects, instead of

diff --git a/t-dll-proc.cc b/t-dll-proc.cc
@@ -18,7 +18,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: t-dll-proc.cc,v 1.34 2001/08/25 23:50:03 steve Exp $"
+#ident "$Id: t-dll-proc.cc,v 1.35 2001/09/15 18:27:04 steve Exp $"
 #endif
 
 # include "config.h"
@@ -29,7 +29,10 @@
 # include  "ivl_target.h"
 # include  "compiler.h"
 # include  "t-dll.h"
+#ifdef HAVE_MALLOC_H
 # include  <malloc.h>
+#endif
+# include  <stdlib.h>
 
 
 bool dll_target::process(const NetProcTop*net)
@@ -666,6 +669,9 @@ void dll_target::proc_while(const NetWhile*net)
 
 /*
  * $Log: t-dll-proc.cc,v $
+ * Revision 1.35  2001/09/15 18:27:04  steve
+ *  Make configure detect malloc.h
+ *
  * Revision 1.34  2001/08/25 23:50:03  steve
  *  Change the NetAssign_ class to refer to the signal
  *  instead of link into the netlist. This is faster

diff --git a/t-dll.cc b/t-dll.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: t-dll.cc,v 1.62 2001/09/09 16:49:04 steve Exp $"
+#ident "$Id: t-dll.cc,v 1.63 2001/09/15 18:27:04 steve Exp $"
 #endif
 
 # include "config.h"
@@ -27,7 +27,10 @@
 # include  "compiler.h"
 # include  "t-dll.h"
 # include  "netmisc.h"
+#ifdef HAVE_MALLOC_H
 # include  <malloc.h>
+#endif
+# include  <stdlib.h>
 
 #if defined(__WIN32__)
 
@@ -1532,6 +1535,9 @@ extern const struct target tgt_dll = { "dll", &dll_target_obj };
 
 /*
  * $Log: t-dll.cc,v $
+ * Revision 1.63  2001/09/15 18:27:04  steve
+ *  Make configure detect malloc.h
+ *
  * Revision 1.62  2001/09/09 16:49:04  steve
  *  Connect right ANEB pin when doing NE comparator.
  *

diff --git a/tgt-fpga/configure.in b/tgt-fpga/configure.in
@@ -11,6 +11,7 @@ AC_CANONICAL_HOST
 
 AC_CYGWIN
 AC_SUBST(CYGWIN)
+AC_CHECK_HEADERS(malloc.h)
 
 # The -fPIC flag is used to tell the compiler to make position
 # independent code. It is needed when making shared objects.

diff --git a/tgt-fpga/d-generic-edif.c b/tgt-fpga/d-generic-edif.c
@@ -16,13 +16,15 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ident "$Id: d-generic-edif.c,v 1.5 2001/09/15 05:06:04 steve Exp $"
+#ident "$Id: d-generic-edif.c,v 1.6 2001/09/15 18:27:04 steve Exp $"
 
 # include  "device.h"
 # include  "fpga_priv.h"
 # include  <stdlib.h>
 # include  <string.h>
+#ifdef HAVE_MALLOC_H
 # include  <malloc.h>
+#endif
 # include  <assert.h>
 
 struct nexus_recall {
@@ -392,6 +394,9 @@ const struct device_s d_generic_edif = {
 
 /*
  * $Log: d-generic-edif.c,v $
+ * Revision 1.6  2001/09/15 18:27:04  steve
+ *  Make configure detect malloc.h
+ *
  * Revision 1.5  2001/09/15 05:06:04  steve
  *  Support != in virtex code generator.
  *

diff --git a/tgt-fpga/d-virtex.c b/tgt-fpga/d-virtex.c
@@ -16,13 +16,15 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ident "$Id: d-virtex.c,v 1.7 2001/09/15 05:06:04 steve Exp $"
+#ident "$Id: d-virtex.c,v 1.8 2001/09/15 18:27:04 steve Exp $"
 
 # include  "device.h"
 # include  "fpga_priv.h"
 # include  <stdlib.h>
 # include  <string.h>
+#ifdef HAVE_MALLOC_H
 # include  <malloc.h>
+#endif
 # include  <assert.h>
 
 /*
@@ -898,6 +900,9 @@ const struct device_s d_virtex_edif = {
 
 /*
  * $Log: d-virtex.c,v $
+ * Revision 1.8  2001/09/15 18:27:04  steve
+ *  Make configure detect malloc.h
+ *
  * Revision 1.7  2001/09/15 05:06:04  steve
  *  Support != in virtex code generator.
  *

diff --git a/tgt-fpga/mangle.c b/tgt-fpga/mangle.c
@@ -16,12 +16,15 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ident "$Id: mangle.c,v 1.3 2001/09/02 21:33:07 steve Exp $"
+#ident "$Id: mangle.c,v 1.4 2001/09/15 18:27:04 steve Exp $"
 
 
 # include  "fpga_priv.h"
 # include  <string.h>
+#ifdef HAVE_MALLOC_H
 # include  <malloc.h>
+#endif
+# include  <stdlib.h>
 
 static size_t xnf_mangle_scope_name(ivl_scope_t net, char*buf, size_t nbuf)
 {
@@ -94,6 +97,9 @@ const char* xnf_mangle_nexus_name(ivl_nexus_t net)
 
 /*
  * $Log: mangle.c,v $
+ * Revision 1.4  2001/09/15 18:27:04  steve
+ *  Make configure detect malloc.h
+ *
  * Revision 1.3  2001/09/02 21:33:07  steve
  *  Rearrange the XNF code generator to be generic-xnf
  *  so that non-XNF code generation is also possible.

diff --git a/tgt-pal/emit_jed.c b/tgt-pal/emit_jed.c
@@ -17,14 +17,17 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: emit_jed.c,v 1.3 2001/07/25 03:10:50 steve Exp $"
+#ident "$Id: emit_jed.c,v 1.4 2001/09/15 18:27:04 steve Exp $"
 #endif
 
 # include "config.h"
 
 # include  "priv.h"
 # include  <stdio.h>
+#ifdef HAVE_MALLOC_H
 # include  <malloc.h>
+#endif
+# include  <stdlib.h>
 # include  <assert.h>
 
 static void draw_macrocell_modes(FILE*jfd)
@@ -131,6 +134,9 @@ int emit_jedec(const char*path)
 
 /*
  * $Log: emit_jed.c,v $
+ * Revision 1.4  2001/09/15 18:27:04  steve
+ *  Make configure detect malloc.h
+ *
  * Revision 1.3  2001/07/25 03:10:50  steve
  *  Create a config.h.in file to hold all the config
  *  junk, and support gcc 3.0. (Stephan Boettcher)

diff --git a/tgt-pal/imain.c b/tgt-pal/imain.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: imain.c,v 1.8 2001/07/25 03:10:50 steve Exp $"
+#ident "$Id: imain.c,v 1.9 2001/09/15 18:27:04 steve Exp $"
 #endif
 
 # include "config.h"
@@ -28,7 +28,9 @@
 
 # include  "priv.h"
 
+#ifdef HAVE_MALLOC_H
 # include  <malloc.h>
+#endif
 # include  <stdio.h>
 # include  <stdlib.h>
 # include  <assert.h>
@@ -152,6 +154,9 @@ DECLARE_CYGWIN_DLL(DllMain);
 
 /*
  * $Log: imain.c,v $
+ * Revision 1.9  2001/09/15 18:27:04  steve
+ *  Make configure detect malloc.h
+ *
  * Revision 1.8  2001/07/25 03:10:50  steve
  *  Create a config.h.in file to hold all the config
  *  junk, and support gcc 3.0. (Stephan Boettcher)

diff --git a/tgt-vvp/configure.in b/tgt-vvp/configure.in
@@ -11,6 +11,7 @@ AC_CANONICAL_HOST
 
 AC_CYGWIN
 AC_SUBST(CYGWIN)
+AC_CHECK_HEADERS(malloc.h)
 
 # The -fPIC flag is used to tell the compiler to make position
 # independent code. It is needed when making shared objects.

diff --git a/tgt-vvp/eval_expr.c b/tgt-vvp/eval_expr.c
@@ -17,12 +17,15 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: eval_expr.c,v 1.43 2001/08/31 01:37:56 steve Exp $"
+#ident "$Id: eval_expr.c,v 1.44 2001/09/15 18:27:04 steve Exp $"
 #endif
 
 # include  "vvp_priv.h"
 # include  <string.h>
+#ifdef HAVE_MALLOC_H
 # include  <malloc.h>
+#endif
+# include  <stdlib.h>
 # include  <assert.h>
 
 struct vector_info draw_eval_expr_wid(ivl_expr_t exp, unsigned wid);
@@ -1197,6 +1200,9 @@ struct vector_info draw_eval_expr(ivl_expr_t exp)
 
 /*
  * $Log: eval_expr.c,v $
+ * Revision 1.44  2001/09/15 18:27:04  steve
+ *  Make configure detect malloc.h
+ *
  * Revision 1.43  2001/08/31 01:37:56  steve
  *  Handle update in place of repeat constants.
  *