You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2006/12/05 11:37:42 UTC
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/port/win...
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/SurfaceDataStructure.cpp
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/gifdecoder.h
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.h
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JPEGDecoder.h
harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/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/windows/hysl.c
harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.h
harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/ui.cpp
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/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/SurfaceDataStructure.cpp (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.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/shared/gifdecoder.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/gifdecoder.h?view=diff&rev=482580&r1=482579&r2=482580
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/gifdecoder.h (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/gifdecoder.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/shared/pngdecoder.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.h?view=diff&rev=482580&r1=482579&r2=482580
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.h (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/pngdecoder.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/jpegdecoder/shared/JPEGDecoder.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JPEGDecoder.h?view=diff&rev=482580&r1=482579&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/jpegencoder/shared/JpegEncoder.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/shared/JpegEncoder.c?view=diff&rev=482580&r1=482579&r2=482580
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/shared/JpegEncoder.c (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/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/include/unix/hysock.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/unix/hysock.h?view=diff&rev=482580&r1=482579&r2=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/port/windows/hysl.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/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/windows/hysl.c (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/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/print/windows/print.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/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/windows/print.h (original)
+++ harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/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/print/windows/ui.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/ui.cpp?view=diff&rev=482580&r1=482579&r2=482580
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/ui.cpp (original)
+++ harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/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>