109210 - freebsd-current build broken by malloc.h

Status: RESOLVED FIXED

(Directory :: LDAP C SDK, defect, P1)

Description

[Michael J Estes]

fresh checkout and build of mozilla on freebsd current broken.

simple fix:

Index: directory/c-sdk//ldap/libraries/liblber/lber-int.h
===================================================================
RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/liblber/lber-int.h,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 lber-int.h
--- directory/c-sdk//ldap/libraries/liblber/lber-int.h	2001/10/26 20:47:20	1.2.2.4
+++ directory/c-sdk//ldap/libraries/liblber/lber-int.h	2001/11/09 02:13:29
@@ -48,7 +48,7 @@
 #ifdef macintosh
 # include "ldap-macos.h"
 #else /* macintosh */
-#if !defined(BSDI) && !defined(DARWIN)
+#if !defined(BSDI) && !defined(DARWIN) && !defined(FREEBSD)
 # include <malloc.h>
 #endif
 # include <errno.h>

malloc.h has been depreciated for years on freebsd, but always just included
stdlib.h

this has been changed to produce a build error if malloc.h is included.

Comment 1

[Mark Smith [:mcs]]

The proposed fix looks fine to me.  I wonder if any platforms need <malloc.h>
today?  Reassigning to Dan for shepherding into the build.

Comment 2

[Dan Mosedale (:dmosedale, :dmose)]

Looks fine to me too; r=dmose on the patch.

Comment 3

[Dan Mosedale (:dmosedale, :dmose)]

sr=sspitzer, in person

Comment 4

[Dan Mosedale (:dmosedale, :dmose)]

Fix checked in to LDAPCSDK_40_BRANCH.  Giving back to mcs for checkin on current
CVS tip.

Comment 5

[zs98]

<malloc.h> shouldn't be included on any post K&R system, particularly BSDI and
Darwin.

Comment 6

[clkao]

i think LDAPCSDK_40_BRANCH is the one we build mozilla isn't it? so i guess this
bug could be closed?

Comment 7

[Mark Smith [:mcs]]

Please leave it open.  Mozilla current builds off LDAPCSDK_40_BRANCH, as you
said. But this fix needs to be committed to ldapcsdk_branch_50, which is the
development tip. Otherwise we will lose it when we change Mozilla to use newer
LDAP C SDK code.

Comment 8

[Dan Mosedale (:dmosedale, :dmose)]

Taking for landing onto ldapcsdk_branch_50.

Comment 9

[scottputterman]

+'ing for upgrade to version 5 of CSDK.

Comment 10

[Dan Mosedale (:dmosedale, :dmose)]

Checked in to ldapcsdk_branch_50.

Comment 11

[Frankie]

Spam for bug 129472