Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Jul 2006 20:52:36 GMT
From:      John Birrell <jb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 100447 for review
Message-ID:  <200607022052.k62KqakZ082437@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=100447

Change 100447 by jb@jb_freebsd2 on 2006/07/02 20:51:57

	Use GNU configure-style #ifdefs to avoid including malloc.h when we
	don't want it.

Affected files ...

.. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_alloc.c#4 edit
.. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_init_finish.c#5 edit
.. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_sort_line.c#4 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/libdwarf/dwarf_alloc.c#4 (text) ====

@@ -41,7 +41,9 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 
 /*
     These files are included to get the sizes

==== //depot/projects/dtrace/src/contrib/libdwarf/dwarf_init_finish.c#5 (text) ====

@@ -57,7 +57,9 @@
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 
 #include "dwarf_incl.h"
 

==== //depot/projects/dtrace/src/contrib/libdwarf/dwarf_sort_line.c#4 (text) ====

@@ -43,7 +43,9 @@
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 
 #define MINIMUM_POSSIBLE_PROLOG_LEN 10  /* 10 is  based on */
 	/*  the definition of the DWARF2/3 line table prolog.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607022052.k62KqakZ082437>