You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by od...@apache.org on 2008/05/21 13:06:20 UTC
svn commit: r658628 - in /harmony/enhanced/classlib/trunk/modules:
awt/src/main/native/oglwrapper/shared/nativelib_common.h
imageio/src/main/native/pngencoder/unix/makefile
Author: odeakin
Date: Wed May 21 04:06:20 2008
New Revision: 658628
URL: http://svn.apache.org/viewvc?rev=658628&view=rev
Log:
Fix a couple of z/OS build problems
Modified:
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/shared/nativelib_common.h
harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/shared/nativelib_common.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/shared/nativelib_common.h?rev=658628&r1=658627&r2=658628&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/shared/nativelib_common.h (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/shared/nativelib_common.h Wed May 21 04:06:20 2008
@@ -21,7 +21,7 @@
#ifndef NATIVELIB_COMMON_H
#define NATIVELIB_COMMON_H
-#if defined(LINUX) || defined(FREEBSD) || defined(AIX) || defined(MACOSX)
+#if defined(LINUX) || defined(FREEBSD) || defined(AIX) || defined(MACOSX) || defined(ZOS)
// common linux section--------------------------------
#include <dlfcn.h>
#include <stdint.h>
@@ -35,7 +35,7 @@
#define INIT_GL_GET_PROC_ADDRESS
-#if !defined(__INTEL_COMPILER) && !defined(AIX)
+#if !defined(__INTEL_COMPILER) && !defined(AIX) && !defined(ZOS)
typedef long long __int64;
#endif
Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile?rev=658628&r1=658627&r2=658628&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile Wed May 21 04:06:20 2008
@@ -32,6 +32,10 @@
OSLIBS += $(STDCLIBS)
+ifeq ($(HY_OS),zos)
+MDLLIBFILES += $(MDLLIBZLIB)
+endif
+
DLLNAME=../libpngencoder$(HY_SHLIB_SUFFIX)
EXPNAME=HYPNGENCODER_0.1