diff --git a/.gitignore b/.gitignore index bb7eb40..679746e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /aarch64-port-b89.tar.xz /aarch64-port-b89x.tar.xz /jdk8-b89x.tar.xz +/aarch64-port-aarch64-20130813.tar.xz diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh index a9c70bd..38bb86b 100755 --- a/generate_source_tarball.sh +++ b/generate_source_tarball.sh @@ -21,7 +21,7 @@ do if [[ "$REPO_NAME" == "aarch64-port" ]] ; then # aarch64-port does not tag trees # FIXME make this clone reproducible - hg clone ${REPO_ROOT} + hg clone ${REPO_ROOT} -r ${VERSION} else hg clone ${REPO_ROOT} -r ${VERSION} fi @@ -45,7 +45,7 @@ do popd find jdk8 -type d -name ".hg" -exec rm -rf '{}' \; || echo ok - tar cJf ${REPO_NAME}-b${VERSION}.tar.xz jdk8 + tar cJf ${REPO_NAME}-${VERSION}.tar.xz jdk8 popd done diff --git a/java-1.8.0-openjdk-arm64-missing-includes.patch b/java-1.8.0-openjdk-arm64-missing-includes.patch deleted file mode 100644 index e65184f..0000000 --- a/java-1.8.0-openjdk-arm64-missing-includes.patch +++ /dev/null @@ -1,31 +0,0 @@ -# HG changeset patch -# User aph -# Date 1375434503 -3600 -# Node ID d9d274bdde7a71eb642ce320e7557d70eea7cee9 -# Parent c1cd345fa3810a1d0e58cec9b31419025fb44ae0 -Add a couple of missing #includes. - -diff -r c1cd345fa381 -r d9d274bdde7a src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp ---- a/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp Mon Jul 29 18:31:19 2013 +0100 -+++ b/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp Fri Aug 02 10:08:23 2013 +0100 -@@ -26,10 +26,11 @@ - - #include "precompiled.hpp" - #include "asm/assembler.hpp" -+#include "c1/c1_CodeStubs.hpp" - #include "c1/c1_Defs.hpp" - #include "c1/c1_MacroAssembler.hpp" - #include "c1/c1_Runtime1.hpp" --#include "c1/c1_CodeStubs.hpp" -+#include "compiler/disassembler.hpp" - #include "interpreter/interpreter.hpp" - #include "nativeInst_aarch64.hpp" - #include "oops/compiledICHolder.hpp" -@@ -38,6 +39,7 @@ - #include "register_aarch64.hpp" - #include "runtime/sharedRuntime.hpp" - #include "runtime/signature.hpp" -+#include "runtime/vframe.hpp" - #include "runtime/vframeArray.hpp" - #include "vmreg_aarch64.inline.hpp" - diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index f979e1f..112c495 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -3,6 +3,7 @@ %global jdk8_version b89x %global hg_tag jdk8-%{jdk8_version} +%global aarch64_hg_tag aarch64-20130813 %global aarch64 aarch64 arm64 armv8 %global multilib_arches %{power64} sparc64 x86_64 %{aarch64} @@ -142,7 +143,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 0.16.%{jdk8_version}%{?dist} +Release: 0.17.%{jdk8_version}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -159,11 +160,12 @@ Group: Development/Languages License: ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and LGPL+ and LGPLv2 and MPLv1.0 and MPLv1.1 and Public Domain and W3C URL: http://openjdk.java.net/ -# Source from upstrem OpenJDK8 project. Use -# './generate_source_tarball.sh %{hg_tag}' to generate. The script clones -# repositories of jdk8 and aarch64-port and removes code not allowed in Fedora. +# Source from upstrem OpenJDK8 project. Use +# './generate_source_tarball.sh %{hg_tag|aarch64_hg_tag}' to generate. +# The script clones repositories of jdk8 and aarch64-port and removes +# code not allowed in Fedora. Source0: jdk8-%{jdk8_version}.tar.xz -Source1: aarch64-port-%{jdk8_version}.tar.xz +Source1: aarch64-port-%{aarch64_hg_tag}.tar.xz # Custom README for -src subpackage Source2: README.src @@ -207,25 +209,11 @@ Patch102: %{name}-size_t.patch Patch103: %{name}-ppc-zero-hotspot.patch Patch201: system-libjpeg.patch -Patch2011: system-libjpegAARCH64.patch Patch202: system-libpng.patch Patch203: system-lcms.patch Patch2031: system-lcmsAARCH64.patch -Patch301: removeMswitchesFromx11.patch -Patch302: %{name}-arm64-missing-includes.patch -Patch310: fix-jvm-cfg.patch - -# To apply 8011366-jdk.patch below, aarch64-port-custom changes need to be rolled back -Patch303: 73799ba02d7f.patch -# These patches are already upstream but not included in the port yet -# http://hg.openjdk.java.net/jdk8/build/jdk/rev/f559fadbf491 -Patch304: 8015087-jdk.patch -# http://hg.openjdk.java.net/jdk8/build/rev/cb51fb4789ac -Patch305: 8015087-root.patch -# http://hg.openjdk.java.net/jdk8/build/jdk/rev/88125d32eb06 -Patch306: 8011366-jdk.patch - +Patch301: fix-jvm-cfg.patch BuildRequires: autoconf BuildRequires: automake @@ -386,12 +374,7 @@ cp %{SOURCE101} jdk8/common/autoconf/build-aux/ sh %{SOURCE12} -%ifarch %{aarch64} -%patch2011 -%else %patch201 -%endif - %patch202 %ifarch %{aarch64} @@ -415,24 +398,10 @@ sh %{SOURCE12} %patch103 %endif -%ifarch %{aarch64} -%patch301 - -pushd jdk8/hotspot >& /dev/null -%patch302 -p1 -popd >& /dev/null +%ifnarch %{aarch64} pushd jdk8 -%patch303 -p1 -%patch304 -p1 -%patch305 -p1 -%patch306 -p1 -popd - -%else - -pushd jdk8 -%patch310 -p1 +%patch301 -p1 popd %endif @@ -977,6 +946,10 @@ exit 0 %doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE %changelog +* Tue Aug 13 2013 Deepak Bhole - 1:1.8.0.0-0.17.b89x +- Updated aarch64 to latest head +- Dropped upstreamed patches + * Wed Aug 07 2013 Omair Majid - 1:1.8.0.0-0.16.b89x - The zero fix only applies on b89 tarball diff --git a/removeMswitchesFromx11.patch b/removeMswitchesFromx11.patch deleted file mode 100644 index 7f3bcb7..0000000 --- a/removeMswitchesFromx11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r b28c6241e16e -r 3c777c472368 makefiles/GensrcX11Wrappers.gmk ---- jdk8/jdk/makefiles/GensrcX11Wrappers.gmk Tue Jul 09 16:04:18 2013 +0100 -+++ jdk8/jdk/makefiles/GensrcX11Wrappers.gmk Thu Jul 25 11:32:02 2013 +0100 -@@ -89,7 +89,7 @@ - # Compile the C code into an executable. - $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c - $(MKDIR) -p $(@D) -- (cd $(@D) && $(CC) -m$* -o $@ $< \ -+ (cd $(@D) && $(CC) -o $@ $< \ - $(X_CFLAGS) \ - $(X_LIBS) \ - -I$(JDK_OUTPUTDIR)/include \ diff --git a/sources b/sources index 2d439d4..02bcff5 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz e1d19c1a7e103b9b3c35a94628ded3b5 desktop-files.tar.gz ba47bbce1edaf42bda8dc4557962babc jdk8-b89x.tar.xz -475e23a72041086c23b541d5563e28fe aarch64-port-b89x.tar.xz +100508e1b8fa8653525e0454f29a9fd8 aarch64-port-aarch64-20130813.tar.xz diff --git a/system-lcmsAARCH64.patch b/system-lcmsAARCH64.patch index f0b6057..17c2c28 100644 --- a/system-lcmsAARCH64.patch +++ b/system-lcmsAARCH64.patch @@ -48,10 +48,10 @@ diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 # Check for the zlib library # -diff --git jdk8/jdk/makefiles/CompileNativeLibraries.gmk jdk8/jdk/makefiles/CompileNativeLibraries.gmk ---- jdk8/jdk/makefiles/CompileNativeLibraries.gmk -+++ jdk8/jdk/makefiles/CompileNativeLibraries.gmk -@@ -1215,8 +1215,8 @@ +diff -up ./jdk8/jdk/makefiles/CompileNativeLibraries.gmk.sav ./jdk8/jdk/makefiles/CompileNativeLibraries.gmk +--- ./jdk8/jdk/makefiles/CompileNativeLibraries.gmk.sav 2013-08-13 12:37:05.000000000 -0400 ++++ ./jdk8/jdk/makefiles/CompileNativeLibraries.gmk 2013-08-13 14:31:24.000000000 -0400 +@@ -1224,8 +1224,8 @@ BUILD_LIBRARIES += $(BUILD_LIBJSDT) ifdef OPENJDK # TODO: Update awt lib path when awt is converted @@ -62,7 +62,7 @@ diff --git jdk8/jdk/makefiles/CompileNativeLibraries.gmk jdk8/jdk/makefiles/Comp OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ SRC:=$(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms,\ LANG:=C,\ -@@ -1234,18 +1234,18 @@ +@@ -1243,18 +1243,18 @@ ifdef OPENJDK LDFLAGS_windows:=$(WIN_AWT_LIB) $(WIN_JAVA_LIB),\ LDFLAGS_SUFFIX_solaris:=-lawt -ljava -ljvm -lc,\ LDFLAGS_SUFFIX_macosx:=$(LIBM) -lawt -ljava -ljvm,\ @@ -73,16 +73,15 @@ diff --git jdk8/jdk/makefiles/CompileNativeLibraries.gmk jdk8/jdk/makefiles/Comp - -D "JDK_FNAME=lcms.dll" \ - -D "JDK_INTERNAL_NAME=lcms" \ + -D "JDK_FNAME=javalcms.dll" \ -+ -D "JDK_INTERNAL_NAME=libjavalcms" \ ++ -D "JDK_INTERNAL_NAME=javalcms" \ -D "JDK_FTYPE=0x2L",\ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/liblcms,\ - DEBUG_SYMBOLS:=true)) + DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) - BUILD_LIBRARIES += $(BUILD_LIBLCMS) -- -- $(BUILD_LIBLCMS) : $(BUILD_LIBAWT) + BUILD_LIBRARIES += $(BUILD_LIBJAVALCMS) -+ + +- $(BUILD_LIBLCMS) : $(BUILD_LIBAWT) + $(BUILD_LIBJAVALCMS) : $(BUILD_LIBAWT) endif diff --git a/system-libjpegAARCH64.patch b/system-libjpegAARCH64.patch deleted file mode 100644 index 63bd56c..0000000 --- a/system-libjpegAARCH64.patch +++ /dev/null @@ -1,207 +0,0 @@ -diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 ---- jdk8/common/autoconf/libraries.m4 -+++ jdk8/common/autoconf/libraries.m4 -@@ -487,11 +487,40 @@ - # Check for the jpeg library - # - --USE_EXTERNAL_LIBJPEG=true --AC_CHECK_LIB(jpeg, main, [], -- [ USE_EXTERNAL_LIBJPEG=false -- AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source]) -- ]) -+AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg], -+ [use libjpeg from build system or OpenJDK sources (system, bundled) @<:@bundled@:>@])]) -+ -+AC_CHECK_LIB(jpeg, jpeg_destroy_compress, -+ [ LIBJPEG_FOUND=yes ], -+ [ LIBJPEG_FOUND=no ]) -+ -+AC_MSG_CHECKING([for which libjpeg to use]) -+ -+# default is bundled -+DEFAULT_LIBJPEG=bundled -+ -+# -+# if user didn't specify, use DEFAULT_LIBJPEG -+# -+if test "x${with_libjpeg}" = "x"; then -+ with_libjpeg=${DEFAULT_LIBJPEG} -+fi -+ -+if test "x${with_libjpeg}" = "xbundled"; then -+ USE_EXTERNAL_LIBJPEG=false -+ AC_MSG_RESULT([bundled]) -+elif test "x${with_libjpeg}" = "xsystem"; then -+ if test "x${LIBJPEG_FOUND}" = "xyes"; then -+ USE_EXTERNAL_LIBJPEG=true -+ AC_MSG_RESULT([system]) -+ else -+ AC_MSG_RESULT([system not found]) -+ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found]) -+ fi -+else -+ AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled']) -+fi -+ - AC_SUBST(USE_EXTERNAL_LIBJPEG) - - ############################################################################### -diff --git a/makefiles/CompileNativeLibraries.gmk b/makefiles/CompileNativeLibraries.gmk ---- jdk8/jdk/makefiles/CompileNativeLibraries.gmk -+++ jdk8/jdk/makefiles/CompileNativeLibraries.gmk -@@ -1249,17 +1249,17 @@ - ########################################################################################## - - ifdef OPENJDK -- BUILD_LIBJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers -+ BUILD_LIBJAVAJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers - else -- BUILD_LIBJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers-closed -- BUILD_LIBJPEG_CLOSED_SRC:=$(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg -- BUILD_LIBJPEG_CLOSED_INCLUDES:=-I$(BUILD_LIBJPEG_CLOSED_SRC) -+ BUILD_LIBJAVAJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers-closed -+ BUILD_LIBJAVAJPEG_CLOSED_SRC:=$(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg -+ BUILD_LIBJAVAJPEG_CLOSED_INCLUDES:=-I$(BUILD_LIBJAVAJPEG_CLOSED_SRC) - endif - --BUILD_LIBJPEG_REORDER:= -+BUILD_LIBJAVAJPEG_REORDER:= - ifeq ($(OPENJDK_TARGET_OS), solaris) - ifneq ($(OPENJDK_TARGET_CPU), x86_64) -- BUILD_LIBJPEG_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU) -+ BUILD_LIBJAVAJPEG_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU) - endif - endif - -@@ -1274,37 +1274,37 @@ - # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ - # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) - # ifeq ($(CC_43_OR_NEWER),1) --# BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered -+# BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered - # endif - #endif - --$(eval $(call SetupNativeCompilation,BUILD_LIBJPEG,\ -- LIBRARY:=jpeg, \ -+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG,\ -+ LIBRARY:=javajpeg, \ - OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ -- SRC:=$(BUILD_LIBJPEG_CLOSED_SRC) \ -+ SRC:=$(BUILD_LIBJAVAJPEG_CLOSED_SRC) \ - $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg,\ - LANG:=C,\ - OPTIMIZATION:=HIGHEST, \ - CFLAGS:=$(CFLAGS_JDKLIB) \ -- $(BUILD_LIBJPEG_CLOSED_INCLUDES) \ -+ $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg,\ -- MAPFILE:=$(BUILD_LIBJPEG_MAPFILE), \ -- LDFLAGS:=$(LDFLAGS_JDKLIB) \ -+ MAPFILE:=$(BUILD_LIBJAVAJPEG_MAPFILE), \ -+ LDFLAGS:=$(LDFLAGS_JDKLIB) -ljpeg \ - $(call SET_SHARED_LIBRARY_ORIGIN),\ - LDFLAGS_windows:=$(WIN_JAVA_LIB) jvm.lib,\ - LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ - VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ - RC_FLAGS:=$(RC_FLAGS)\ -- -D "JDK_FNAME=jpeg.dll" \ -- -D "JDK_INTERNAL_NAME=jpeg" \ -+ -D "JDK_FNAME=javajpeg.dll" \ -+ -D "JDK_INTERNAL_NAME=javajpeg" \ - -D "JDK_FTYPE=0x2L",\ -- REORDER:=$(BUILD_LIBJPEG_REORDER),\ -- OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjpeg,\ -+ REORDER:=$(BUILD_LIBJAVAJPEG_REORDER),\ -+ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjavajpeg,\ - DEBUG_SYMBOLS:=true)) - --$(BUILD_LIBJPEG) : $(BUILD_LIBJAVA) -- --BUILD_LIBRARIES += $(BUILD_LIBJPEG) -+$(BUILD_LIBJAVAJPEG) : $(BUILD_LIBJAVA) -+ -+BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG) - - ########################################################################################## - -@@ -2441,7 +2441,7 @@ - -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ - -framework JavaNativeFoundation - else ifneq ($(OPENJDK_TARGET_OS), windows) -- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread -+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread -ljpeg - else # OPENJDK_TARGET_OS - LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll - endif # OPENJDK_TARGET_OS -@@ -2457,7 +2457,7 @@ - MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \ - LDFLAGS:=$(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN),\ -- LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS),\ -+ LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS) -ljpeg,\ - LDFLAGS_SUFFIX_solaris:=-lc,\ - VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ - RC_FLAGS:=$(RC_FLAGS)\ -diff --git a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java ---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java -+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java -@@ -89,7 +89,7 @@ - java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public Void run() { -- System.loadLibrary("jpeg"); -+ System.loadLibrary("javajpeg"); - return null; - } - }); -diff --git a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java ---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java -+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java -@@ -179,7 +179,7 @@ - java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public Void run() { -- System.loadLibrary("jpeg"); -+ System.loadLibrary("javajpeg"); - return null; - } - }); -diff --git a/src/share/classes/sun/awt/image/JPEGImageDecoder.java b/src/share/classes/sun/awt/image/JPEGImageDecoder.java ---- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java -+++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java -@@ -56,7 +56,7 @@ - java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public Void run() { -- System.loadLibrary("jpeg"); -+ System.loadLibrary("javajpeg"); - return null; - } - }); -diff --git a/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c b/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c ---- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c -+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c -@@ -25,7 +25,6 @@ - - #include "splashscreen_impl.h" - --#include "jinclude.h" - #include "jpeglib.h" - #include "jerror.h" - -@@ -107,11 +106,11 @@ - if (cinfo->src == NULL) { /* first time for this JPEG object? */ - cinfo->src = (struct jpeg_source_mgr *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, -- JPOOL_PERMANENT, SIZEOF(stream_source_mgr)); -+ JPOOL_PERMANENT, sizeof(stream_source_mgr)); - src = (stream_src_ptr) cinfo->src; - src->buffer = (JOCTET *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, -- JPOOL_PERMANENT, INPUT_BUF_SIZE * SIZEOF(JOCTET)); -+ JPOOL_PERMANENT, INPUT_BUF_SIZE * sizeof(JOCTET)); - } - - src = (stream_src_ptr) cinfo->src;