[GRASS5] RE: [GRASS-CVS] scott: grass6/raster/simwe/r.sim.water main.c,1.9,1.10

Markus Neteler neteler at itc.it
Sun Jan 22 18:57:34 EST 2006


does anyone know how the malloc.h should be done below?
AFAIK, GRASS is free of malloc.h except for below code.


-----Original Message-----
From: grass-commit-admin at grass.itc.it on behalf of grass at intevation.de
Sent: Sun 2006-01-22 05:06
To: grass-commit at grass.itc.it
Subject: [GRASS-CVS] scott: grass6/raster/simwe/r.sim.water main.c,1.9,1.10
Author: scott

Update of /grassrepository/grass6/raster/simwe/r.sim.water
In directory doto:/tmp/cvs-serv11961

Modified Files:
Log Message:
Added check for Apple compiler in check for malloc.h - may not be appropriate check?

Index: main.c
RCS file: /grassrepository/grass6/raster/simwe/r.sim.water/main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- main.c	19 Jan 2006 12:57:28 -0000	1.9
+++ main.c	22 Jan 2006 04:06:06 -0000	1.10
@@ -42,8 +42,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
+#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE_CC__))
 /* <malloc.h> has been replaced by <stdlib.h> in *BSD. */
+/* and Mac OS X is based on BSD, but apparently doesn't define those symbols */
+/* At the moment, if APPLE_CC is defined, we're using Apple's compilers - */
+/* but that probably isn't the best test.  What is a better way ? */
 #include <malloc.h>

grass-commit mailing list
grass-commit at grass.itc.it

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/ms-tnef
Size: 3483 bytes
Desc: not available
Url : http://lists.osgeo.org/pipermail/grass-dev/attachments/20060123/59232a70/attachment.bin

More information about the grass-dev mailing list