harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mark Hindess <mark.hind...@googlemail.com>
Subject Re: svn commit: r482580 - in /harmony/enhanced/classlib/trunk/modules: awt/src/main/native/gl/shared/ awt/src/main/native/jpegdecoder/shared/ imageio/src/main/native/jpegencoder/shared/ portlib/src/main/native/include/unix/ portlib/src/main/native/po
Date Tue, 05 Dec 2006 15:11:10 GMT

On 5 December 2006 at 16:36, "Alexey Petrenko" <alexey.a.petrenko@gmail.com> wrote:
> Mark,
> 
> I've reverted your patch for hysl.c since it brokes the build on
> Windows. It could not find alloca definition in line 274.

Thanks.  Seems wrong, but since this file is windows-specific, we can
leave it as malloc.h.

(I removed the malloc.h include for other platforms since it is really
not the correct header.  The man page for malloc on linux clear shows
the use of stdlib.h and FreeBSD gives an error if you try to use
malloc.h telling you to use stdlib.h instead.)

Thanks again,
 Mark.


> It is strange but MS help says that this function is defined in
> malloc.h and example includes only windows.h and stdio.h. hysl.c
> include both these headers but still fails.
> 
> Need future investigation.
>
> SY, Alexey
> 
> 2006/12/5, hindessm@apache.org <hindessm@apache.org>:
> > Author: hindessm
> > Date: Tue Dec  5 02:37:41 2006
> > New Revision: 482580
> >
> > URL: http://svn.apache.org/viewvc?view=rev&rev=482580
> > Log:
> > Change #include <malloc.h> to the more correct/portable #include <stdlib.h>
> .
> >
> > Modified:
> >    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/Su
> rfaceDataStructure.cpp
> >    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/gi
> fdecoder.h
> >    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pn
> gdecoder.h
> >    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/
> shared/JPEGDecoder.h
> >    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegenco
> der/shared/JpegEncoder.c
> >    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/
> unix/hysock.h
> >    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/win
> dows/hysl.c
> >    harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/wind
> ows/print.h
> >    harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/wind
> ows/ui.cpp
> >
> > Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/sh
> ared/SurfaceDataStructure.cpp
> > URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/a
> wt/src/main/native/gl/shared/SurfaceDataStructure.cpp?view=diff&rev=482580&r1
> =482579&r2=482580
> > ===========================================================================
> ===
> > --- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/S
> urfaceDataStructure.cpp (original)
> > +++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/S
> urfaceDataStructure.cpp Tue Dec  5 02:37:41 2006
> > @@ -21,7 +21,7 @@
> >  */
> >
> >  #include <stdlib.h>
> > -#include <malloc.h>
> > +#include <stdlib.h>
> >  #include <memory.h>
> >
> >  #include "SurfaceDataStructure.h"
> >
> > Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/sh
> ared/gifdecoder.h
> > URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/a
> wt/src/main/native/gl/shared/gifdecoder.h?view=diff&rev=482580&r1=482579&r2=4
> 82580
> > ===========================================================================
> ===
> > --- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/g
> ifdecoder.h (original)
> > +++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/g
> ifdecoder.h Tue Dec  5 02:37:41 2006
> > @@ -24,7 +24,7 @@
> >  #define _Included_JPEGDecoder
> >
> >  #include <string.h>
> > -#include <malloc.h>
> > +#include <stdlib.h>
> >  #include <assert.h>
> >
> >  #include "org_apache_harmony_awt_gl_image_GifDecoder.h"
> >
> > Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/sh
> ared/pngdecoder.h
> > URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/a
> wt/src/main/native/gl/shared/pngdecoder.h?view=diff&rev=482580&r1=482579&r2=4
> 82580
> > ===========================================================================
> ===
> > --- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/p
> ngdecoder.h (original)
> > +++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/p
> ngdecoder.h Tue Dec  5 02:37:41 2006
> > @@ -23,7 +23,7 @@
> >  #ifndef _Included_PNGDecoder
> >  #define _Included_PNGDecoder
> >
> > -#include <malloc.h> // Strange because it's already included in pngconf.h,
>  but it's needed
> > +#include <stdlib.h> // Strange because it's already included in pngconf.h,
>  but it's needed
> >  //#include <setjmp.h>
> >
> >  #include "png.h"
> >
> > Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegd
> ecoder/shared/JPEGDecoder.h
> > URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/a
> wt/src/main/native/jpegdecoder/shared/JPEGDecoder.h?view=diff&rev=482580&r1=4
> 82579&r2=482580
> > ===========================================================================
> ===
> > --- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder
> /shared/JPEGDecoder.h (original)
> > +++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder
> /shared/JPEGDecoder.h Tue Dec  5 02:37:41 2006
> > @@ -24,7 +24,7 @@
> >  #define _Included_JPEGDecoder
> >
> >  #include <string.h>
> > -#include <malloc.h>
> > +#include <stdlib.h>
> >  #include <assert.h>
> >
> >  #include "org_apache_harmony_awt_gl_image_JpegDecoder.h"
> >
> > Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/j
> pegencoder/shared/JpegEncoder.c
> > URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/i
> mageio/src/main/native/jpegencoder/shared/JpegEncoder.c?view=diff&rev=482580&
> r1=482579&r2=482580
> > ===========================================================================
> ===
> > --- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegenc
> oder/shared/JpegEncoder.c (original)
> > +++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegenc
> oder/shared/JpegEncoder.c Tue Dec  5 02:37:41 2006
> > @@ -20,7 +20,7 @@
> >  */
> >
> >  #include <string.h>
> > -#include <malloc.h>
> > +#include <stdlib.h>
> >  #include <assert.h>
> >
> >  #include "org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter.h"
> >
> > Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/i
> nclude/unix/hysock.h
> > URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/p
> ortlib/src/main/native/include/unix/hysock.h?view=diff&rev=482580&r1=482579&r
> 2=482580
> > ===========================================================================
> ===
> > --- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include
> /unix/hysock.h (original)
> > +++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include
> /unix/hysock.h Tue Dec  5 02:37:41 2006
> > @@ -31,7 +31,7 @@
> >  #include <netinet/tcp.h>
> >  #include <netdb.h>
> >  #include <sys/time.h>
> > -#include <malloc.h>
> > +#include <stdlib.h>
> >  #include <sys/socketvar.h>
> >  #include "hysocket.h"
> >  #include "hycomp.h"
> >
> > Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/p
> ort/windows/hysl.c
> > URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/p
> ortlib/src/main/native/port/windows/hysl.c?view=diff&rev=482580&r1=482579&r2=
> 482580
> > ===========================================================================
> ===
> > --- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/wi
> ndows/hysl.c (original)
> > +++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/wi
> ndows/hysl.c Tue Dec  5 02:37:41 2006
> > @@ -27,7 +27,7 @@
> >  #include "hyport.h"
> >  #include <stdio.h>
> >  #include <stdlib.h>
> > -#include <malloc.h>
> > +#include <stdlib.h>
> >  #include "portnls.h"
> >
> >  #if !defined(HINSTANCE_ERROR)
> >
> > Modified: harmony/enhanced/classlib/trunk/modules/print/src/main/native/pri
> nt/windows/print.h
> > URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/p
> rint/src/main/native/print/windows/print.h?view=diff&rev=482580&r1=482579&r2=
> 482580
> > ===========================================================================
> ===
> > --- harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/win
> dows/print.h (original)
> > +++ harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/win
> dows/print.h Tue Dec  5 02:37:41 2006
> > @@ -27,6 +27,6 @@
> >
> >  #define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows 
> headers
> >
> > -#include <malloc.h>
> > +#include <stdlib.h>
> >  #include <windows.h>
> >  #include <winspool.h>
> >
> > Modified: harmony/enhanced/classlib/trunk/modules/print/src/main/native/pri
> nt/windows/ui.cpp
> > URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/p
> rint/src/main/native/print/windows/ui.cpp?view=diff&rev=482580&r1=482579&r2=4
> 82580
> > ===========================================================================
> ===
> > --- harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/win
> dows/ui.cpp (original)
> > +++ harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/win
> dows/ui.cpp Tue Dec  5 02:37:41 2006
> > @@ -38,7 +38,7 @@
> >
> >  #include <commdlg.h>
> >  #include <wingdi.h>
> > -#include <malloc.h>
> > +#include <stdlib.h>
> >  #include <Windef.h>
> >  #include <winspool.h>
> >
> >
> >
> >
> 



Mime
View raw message