harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r478101 [2/5] - in /harmony/enhanced/classlib/trunk/modules: archive/src/main/native/archive/linux/ archive/src/main/native/archive/windows/ archive/src/main/native/zlib/linux/ archive/src/main/native/zlib/windows/ auth/src/main/native/auth...
Date Wed, 22 Nov 2006 09:37:41 GMT
Propchange: harmony/enhanced/classlib/trunk/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/trunk/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGImageReadParam.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/trunk/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/libjpegencoder.exp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/libjpegencoder.exp?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/libjpegencoder.exp (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/libjpegencoder.exp Wed Nov 22 01:37:36 2006
@@ -1,10 +1,10 @@
-HYJPEGDECODER_0.1 {
-    global :
-        Java_org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter_dispose;
-        Java_org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter_initWriterIds;
-        Java_org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter_initCompressionObj;
-        Java_org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter_setIOS;
-        Java_org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter_encode;
-    local : *;
-};
-
+HYJPEGDECODER_0.1 {
+    global :
+        Java_org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter_dispose;
+        Java_org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter_initWriterIds;
+        Java_org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter_initCompressionObj;
+        Java_org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter_setIOS;
+        Java_org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter_encode;
+    local : *;
+};
+

Propchange: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/libjpegencoder.exp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile Wed Nov 22 01:37:36 2006
@@ -1,41 +1,41 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-include $(HY_HDK)/build/make/makefile.include
-
-JPEG_DIR=$(HY_HDK)/../depends/libs/build/jpeg/
-
-CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include -I$(JPEG_DIR)
-
-BUILDFILES = \
-  $(SHAREDSUB)/JpegEncoder.o \
-  libjpeg.a
-
-MDLLIBFILES = \
-	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
-
-DLLNAME=../libjpegencoder.so
-
-include $(HY_HDK)/build/make/rules.mk
-
-$(SHAREDSUB)JpegEncoder.o: jconfig.h
-
-jconfig.h: $(JPEG_DIR)jconfig.lnx
-	cp $< $@
-
-libjpeg.a: $(JPEG_DIR)libjpeg.$(HY_PLATFORM)
-	cp $< $@
-
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+include $(HY_HDK)/build/make/makefile.include
+
+JPEG_DIR=$(HY_HDK)/../depends/libs/build/jpeg/
+
+CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include -I$(JPEG_DIR)
+
+BUILDFILES = \
+  $(SHAREDSUB)/JpegEncoder.o \
+  libjpeg.a
+
+MDLLIBFILES = \
+	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+
+DLLNAME=../libjpegencoder.so
+
+include $(HY_HDK)/build/make/rules.mk
+
+$(SHAREDSUB)JpegEncoder.o: jconfig.h
+
+jconfig.h: $(JPEG_DIR)jconfig.lnx
+	cp $< $@
+
+libjpeg.a: $(JPEG_DIR)libjpeg.$(HY_PLATFORM)
+	cp $< $@
+

Propchange: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.def
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.def?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.def (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.def Wed Nov 22 01:37:36 2006
@@ -1,7 +1,7 @@
-LIBRARY	JPEGENCODER
-
-SECTIONS
-	.data	READ WRITE
-	.text	EXECUTE READ
-
-EXPORTS
+LIBRARY	JPEGENCODER
+
+SECTIONS
+	.data	READ WRITE
+	.text	EXECUTE READ
+
+EXPORTS

Propchange: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.rc
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.rc?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.rc (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.rc Wed Nov 22 01:37:36 2006
@@ -1,48 +1,48 @@
-;
-; Licensed to the Apache Software Foundation (ASF) under one or more
-; contributor license agreements.  See the NOTICE file distributed with
-; this work for additional information regarding copyright ownership.
-; The ASF licenses this file to You under the Apache License, Version 2.0
-; (the "License"); you may not use this file except in compliance with
-; the License.  You may obtain a copy of the License at
-; 
-;     http://www.apache.org/licenses/LICENSE-2.0
-; 
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-;
-
-#include <windows.h>
-#include <winver.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,0,0
- PRODUCTVERSION 0,1,0,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-	BLOCK "StringFileInfo"
-	BEGIN
-		BLOCK "040904b0"
-		BEGIN
-			VALUE "CompanyName", "The Apache Software Foundation.\0"
-			VALUE "FileDescription", "JPEG encoder native code\0"
-			VALUE "FileVersion", "0.1\0"
-			VALUE "InternalName", "jpegencoder\0"
-			VALUE "LegalCopyright", "(c) Copyright 2006 The Apache Software Foundation or its licensors, as applicable.\0"
-			VALUE "OriginalFilename", "jpegencoder.dll\0"
-			VALUE "ProductName", "Apache Harmony\0"
-			VALUE "ProductVersion", "0.1\0"
-		END
-	END
-	BLOCK "VarFileInfo"
-	BEGIN
-		VALUE "Translation", 0x0409, 1200
-	END
-END
+;
+; Licensed to the Apache Software Foundation (ASF) under one or more
+; contributor license agreements.  See the NOTICE file distributed with
+; this work for additional information regarding copyright ownership.
+; The ASF licenses this file to You under the Apache License, Version 2.0
+; (the "License"); you may not use this file except in compliance with
+; the License.  You may obtain a copy of the License at
+; 
+;     http://www.apache.org/licenses/LICENSE-2.0
+; 
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+
+#include <windows.h>
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,1,0,0
+ PRODUCTVERSION 0,1,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE "CompanyName", "The Apache Software Foundation.\0"
+			VALUE "FileDescription", "JPEG encoder native code\0"
+			VALUE "FileVersion", "0.1\0"
+			VALUE "InternalName", "jpegencoder\0"
+			VALUE "LegalCopyright", "(c) Copyright 2006 The Apache Software Foundation or its licensors, as applicable.\0"
+			VALUE "OriginalFilename", "jpegencoder.dll\0"
+			VALUE "ProductName", "Apache Harmony\0"
+			VALUE "ProductVersion", "0.1\0"
+		END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x0409, 1200
+	END
+END

Propchange: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile Wed Nov 22 01:37:36 2006
@@ -1,51 +1,51 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-!include <$(HY_HDK)\build\make\defines.mak>
-
-JPEG_DIR=$(HY_HDK)\..\depends\libs\build\jpeg\# avoid continuation
-
-LIBBASE=jpegencoder
-DLLNAME=..\$(LIBBASE).dll
-LIBNAME=$(LIBPATH)$(LIBBASE).lib
-HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
-
-# TOFIX: fix warning so we can use default HYCFLAGS
-# That is:
-# HYCFLAGS = $(HYCFLAGS) -I$(SHAREDSUB)\include -I$(JPEG_DIR)
-HYCFLAGS = \
-  -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
-  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0400 \
-  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
-  -I$(SHAREDSUB)\include -I$(JPEG_DIR)
-
-BUILDFILES = $(SHAREDSUB)JpegEncoder.obj
-
-VIRTFILES = $(LIBBASE).res
-SYSLIBFILES = ws2_32.lib Iphlpapi.lib
-
-MDLLIBFILES = \
-  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
-  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib $(JPEG_DIR)libjpeg.lib
-
-DLLBASE=0x13300000
-COMMENT=/comment:"JPEGENCODER native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
-
-!include <$(HY_HDK)\build\make\rules.mak>
-
-$(SHAREDSUB)JpegEncoder.obj: jconfig.h
-
-jconfig.h: $(JPEG_DIR)jconfig.vc
-	copy $(JPEG_DIR)jconfig.vc $@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+!include <$(HY_HDK)\build\make\defines.mak>
+
+JPEG_DIR=$(HY_HDK)\..\depends\libs\build\jpeg\# avoid continuation
+
+LIBBASE=jpegencoder
+DLLNAME=..\$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
+
+# TOFIX: fix warning so we can use default HYCFLAGS
+# That is:
+# HYCFLAGS = $(HYCFLAGS) -I$(SHAREDSUB)\include -I$(JPEG_DIR)
+HYCFLAGS = \
+  -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
+  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0400 \
+  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
+  -I$(SHAREDSUB)\include -I$(JPEG_DIR)
+
+BUILDFILES = $(SHAREDSUB)JpegEncoder.obj
+
+VIRTFILES = $(LIBBASE).res
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib
+
+MDLLIBFILES = \
+  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
+  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib $(JPEG_DIR)libjpeg.lib
+
+DLLBASE=0x13300000
+COMMENT=/comment:"JPEGENCODER native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
+
+!include <$(HY_HDK)\build\make\rules.mak>
+
+$(SHAREDSUB)JpegEncoder.obj: jconfig.h
+
+jconfig.h: $(JPEG_DIR)jconfig.vc
+	copy $(JPEG_DIR)jconfig.vc $@

Propchange: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/libhyinstrument.exp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/libhyinstrument.exp?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/libhyinstrument.exp (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/libhyinstrument.exp Wed Nov 22 01:37:36 2006
@@ -1,10 +1,10 @@
-HYINSTRUMENT_0.1 {
-	global :
-	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_getAllLoadedClasses;
-	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_getInitiatedClasses;
-	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_getObjectSize_1native;
-	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_redefineClasses_1native;
-	Agent_OnUnload;
-	Agent_OnLoad;
-	local : *;
-};
+HYINSTRUMENT_0.1 {
+	global :
+	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_getAllLoadedClasses;
+	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_getInitiatedClasses;
+	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_getObjectSize_1native;
+	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_redefineClasses_1native;
+	Agent_OnUnload;
+	Agent_OnLoad;
+	local : *;
+};

Propchange: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/libhyinstrument.exp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/hyinstrument.def
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/hyinstrument.def?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/hyinstrument.def (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/hyinstrument.def Wed Nov 22 01:37:36 2006
@@ -1,15 +1,15 @@
-LIBRARY	HYINSTRUMENT
-
-SECTIONS
-	.data	READ WRITE
-	.text	EXECUTE READ
-
-EXPORTS
-	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_getAllLoadedClasses	
-	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_getInitiatedClasses
-	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_getObjectSize_1native
-	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_redefineClasses_1native
-	Agent_OnUnload
-	Agent_OnLoad
-	
-
+LIBRARY	HYINSTRUMENT
+
+SECTIONS
+	.data	READ WRITE
+	.text	EXECUTE READ
+
+EXPORTS
+	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_getAllLoadedClasses	
+	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_getInitiatedClasses
+	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_getObjectSize_1native
+	Java_org_apache_harmony_instrument_internal_InstrumentationImpl_redefineClasses_1native
+	Agent_OnUnload
+	Agent_OnLoad
+	
+

Propchange: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/hyinstrument.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile Wed Nov 22 01:37:36 2006
@@ -1,55 +1,55 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-#
-# Makefile for module 'fdlibm'
-#
-
-include $(HY_HDK)/build/make/makefile.include
-
-FDLIBM_DIST=../../fdlibm_dist/
-
-BUILDFILES = \
-	$(FDLIBM_DIST)e_acos.o $(FDLIBM_DIST)e_acosh.o $(FDLIBM_DIST)e_asin.o $(FDLIBM_DIST)e_atan2.o \
-	$(FDLIBM_DIST)e_atanh.o $(FDLIBM_DIST)e_cosh.o $(FDLIBM_DIST)e_exp.o $(FDLIBM_DIST)e_fmod.o \
-	$(FDLIBM_DIST)e_gamma.o $(FDLIBM_DIST)e_gamma_r.o $(FDLIBM_DIST)e_hypot.o $(FDLIBM_DIST)e_j0.o \
-	$(FDLIBM_DIST)e_j1.o $(FDLIBM_DIST)e_jn.o $(FDLIBM_DIST)e_lgamma.o $(FDLIBM_DIST)e_lgamma_r.o \
-	$(FDLIBM_DIST)e_log.o $(FDLIBM_DIST)e_log10.o $(FDLIBM_DIST)e_pow.o $(FDLIBM_DIST)e_rem_pio2.o \
-	$(FDLIBM_DIST)e_remainder.o $(FDLIBM_DIST)e_scalb.o $(FDLIBM_DIST)e_sinh.o $(FDLIBM_DIST)e_sqrt.o \
-	$(FDLIBM_DIST)k_cos.o $(FDLIBM_DIST)k_rem_pio2.o $(FDLIBM_DIST)k_sin.o $(FDLIBM_DIST)k_standard.o \
-	$(FDLIBM_DIST)k_tan.o $(FDLIBM_DIST)s_asinh.o $(FDLIBM_DIST)s_atan.o $(FDLIBM_DIST)s_cbrt.o $(FDLIBM_DIST)s_ceil.o \
-	$(FDLIBM_DIST)s_copysign.o $(FDLIBM_DIST)s_cos.o $(FDLIBM_DIST)s_erf.o $(FDLIBM_DIST)s_expm1.o \
-	$(FDLIBM_DIST)s_fabs.o $(FDLIBM_DIST)s_finite.o $(FDLIBM_DIST)s_floor.o $(FDLIBM_DIST)s_frexp.o \
-	$(FDLIBM_DIST)s_ilogb.o $(FDLIBM_DIST)s_isnan.o $(FDLIBM_DIST)s_ldexp.o \
-	$(SHAREDSUB)s_lib_version.o \
-	$(FDLIBM_DIST)s_log1p.o $(FDLIBM_DIST)s_logb.o $(FDLIBM_DIST)s_matherr.o $(FDLIBM_DIST)s_modf.o \
-	$(FDLIBM_DIST)s_nextafter.o $(FDLIBM_DIST)s_rint.o $(FDLIBM_DIST)s_scalbn.o $(FDLIBM_DIST)s_signgam.o \
-	$(FDLIBM_DIST)s_significand.o $(FDLIBM_DIST)s_sin.o $(FDLIBM_DIST)s_tan.o $(FDLIBM_DIST)s_tanh.o \
-	$(FDLIBM_DIST)w_acos.o $(FDLIBM_DIST)w_acosh.o $(FDLIBM_DIST)w_asin.o $(FDLIBM_DIST)w_atan2.o \
-	$(FDLIBM_DIST)w_atanh.o $(FDLIBM_DIST)w_cosh.o $(FDLIBM_DIST)w_exp.o $(FDLIBM_DIST)w_fmod.o \
-	$(FDLIBM_DIST)w_gamma.o $(FDLIBM_DIST)w_gamma_r.o $(FDLIBM_DIST)w_hypot.o $(FDLIBM_DIST)w_j0.o \
-	$(FDLIBM_DIST)w_j1.o $(FDLIBM_DIST)w_jn.o $(FDLIBM_DIST)w_lgamma.o $(FDLIBM_DIST)w_lgamma_r.o \
-	$(FDLIBM_DIST)w_log.o $(FDLIBM_DIST)w_log10.o $(FDLIBM_DIST)w_pow.o $(FDLIBM_DIST)w_remainder.o \
-	$(FDLIBM_DIST)w_scalb.o $(FDLIBM_DIST)w_sinh.o $(FDLIBM_DIST)w_sqrt.o
-
-# CFLAGS are overriden not just appended to
-CFLAGS= -O0 -fpic -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86 -D_IEEE_LIBM \
-        -DHY_PLATFORM_DOUBLE_ORDER \
-	-I. -I$(SHAREDSUB) -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include \
-	-ffloat-store $(VMDEBUG)
-
-LIBNAME = $(LIBPATH)libhyfdlibm.a
-
-include $(HY_HDK)/build/make/rules.mk
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+#
+# Makefile for module 'fdlibm'
+#
+
+include $(HY_HDK)/build/make/makefile.include
+
+FDLIBM_DIST=../../fdlibm_dist/
+
+BUILDFILES = \
+	$(FDLIBM_DIST)e_acos.o $(FDLIBM_DIST)e_acosh.o $(FDLIBM_DIST)e_asin.o $(FDLIBM_DIST)e_atan2.o \
+	$(FDLIBM_DIST)e_atanh.o $(FDLIBM_DIST)e_cosh.o $(FDLIBM_DIST)e_exp.o $(FDLIBM_DIST)e_fmod.o \
+	$(FDLIBM_DIST)e_gamma.o $(FDLIBM_DIST)e_gamma_r.o $(FDLIBM_DIST)e_hypot.o $(FDLIBM_DIST)e_j0.o \
+	$(FDLIBM_DIST)e_j1.o $(FDLIBM_DIST)e_jn.o $(FDLIBM_DIST)e_lgamma.o $(FDLIBM_DIST)e_lgamma_r.o \
+	$(FDLIBM_DIST)e_log.o $(FDLIBM_DIST)e_log10.o $(FDLIBM_DIST)e_pow.o $(FDLIBM_DIST)e_rem_pio2.o \
+	$(FDLIBM_DIST)e_remainder.o $(FDLIBM_DIST)e_scalb.o $(FDLIBM_DIST)e_sinh.o $(FDLIBM_DIST)e_sqrt.o \
+	$(FDLIBM_DIST)k_cos.o $(FDLIBM_DIST)k_rem_pio2.o $(FDLIBM_DIST)k_sin.o $(FDLIBM_DIST)k_standard.o \
+	$(FDLIBM_DIST)k_tan.o $(FDLIBM_DIST)s_asinh.o $(FDLIBM_DIST)s_atan.o $(FDLIBM_DIST)s_cbrt.o $(FDLIBM_DIST)s_ceil.o \
+	$(FDLIBM_DIST)s_copysign.o $(FDLIBM_DIST)s_cos.o $(FDLIBM_DIST)s_erf.o $(FDLIBM_DIST)s_expm1.o \
+	$(FDLIBM_DIST)s_fabs.o $(FDLIBM_DIST)s_finite.o $(FDLIBM_DIST)s_floor.o $(FDLIBM_DIST)s_frexp.o \
+	$(FDLIBM_DIST)s_ilogb.o $(FDLIBM_DIST)s_isnan.o $(FDLIBM_DIST)s_ldexp.o \
+	$(SHAREDSUB)s_lib_version.o \
+	$(FDLIBM_DIST)s_log1p.o $(FDLIBM_DIST)s_logb.o $(FDLIBM_DIST)s_matherr.o $(FDLIBM_DIST)s_modf.o \
+	$(FDLIBM_DIST)s_nextafter.o $(FDLIBM_DIST)s_rint.o $(FDLIBM_DIST)s_scalbn.o $(FDLIBM_DIST)s_signgam.o \
+	$(FDLIBM_DIST)s_significand.o $(FDLIBM_DIST)s_sin.o $(FDLIBM_DIST)s_tan.o $(FDLIBM_DIST)s_tanh.o \
+	$(FDLIBM_DIST)w_acos.o $(FDLIBM_DIST)w_acosh.o $(FDLIBM_DIST)w_asin.o $(FDLIBM_DIST)w_atan2.o \
+	$(FDLIBM_DIST)w_atanh.o $(FDLIBM_DIST)w_cosh.o $(FDLIBM_DIST)w_exp.o $(FDLIBM_DIST)w_fmod.o \
+	$(FDLIBM_DIST)w_gamma.o $(FDLIBM_DIST)w_gamma_r.o $(FDLIBM_DIST)w_hypot.o $(FDLIBM_DIST)w_j0.o \
+	$(FDLIBM_DIST)w_j1.o $(FDLIBM_DIST)w_jn.o $(FDLIBM_DIST)w_lgamma.o $(FDLIBM_DIST)w_lgamma_r.o \
+	$(FDLIBM_DIST)w_log.o $(FDLIBM_DIST)w_log10.o $(FDLIBM_DIST)w_pow.o $(FDLIBM_DIST)w_remainder.o \
+	$(FDLIBM_DIST)w_scalb.o $(FDLIBM_DIST)w_sinh.o $(FDLIBM_DIST)w_sqrt.o
+
+# CFLAGS are overriden not just appended to
+CFLAGS= -O0 -fpic -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86 -D_IEEE_LIBM \
+        -DHY_PLATFORM_DOUBLE_ORDER \
+	-I. -I$(SHAREDSUB) -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include \
+	-ffloat-store $(VMDEBUG)
+
+LIBNAME = $(LIBPATH)libhyfdlibm.a
+
+include $(HY_HDK)/build/make/rules.mk

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/windows/makefile?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/windows/makefile Wed Nov 22 01:37:36 2006
@@ -1,64 +1,64 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-#
-# Makefile for module 'fdlibm'
-#
-
-!include <$(HY_HDK)\build\make\defines.mak>
-
-LIBNAME=$(LIBPATH)hyfdlibm.lib
-
-FDLIBM_DIST=..\..\fdlibm_dist\# Comment to stop line continuation
-
-BUILDFILES = \
-  $(FDLIBM_DIST)e_acos.obj $(FDLIBM_DIST)e_acosh.obj $(FDLIBM_DIST)e_asin.obj $(FDLIBM_DIST)e_atan2.obj \
-  $(FDLIBM_DIST)e_atanh.obj $(FDLIBM_DIST)e_cosh.obj $(FDLIBM_DIST)e_exp.obj $(FDLIBM_DIST)e_fmod.obj \
-  $(FDLIBM_DIST)e_gamma.obj $(FDLIBM_DIST)e_gamma_r.obj $(FDLIBM_DIST)e_hypot.obj $(FDLIBM_DIST)e_j0.obj \
-  $(FDLIBM_DIST)e_j1.obj $(FDLIBM_DIST)e_jn.obj $(FDLIBM_DIST)e_lgamma.obj $(FDLIBM_DIST)e_lgamma_r.obj \
-  $(FDLIBM_DIST)e_log.obj $(FDLIBM_DIST)e_log10.obj $(FDLIBM_DIST)e_pow.obj $(FDLIBM_DIST)e_rem_pio2.obj \
-  $(FDLIBM_DIST)e_remainder.obj $(FDLIBM_DIST)e_scalb.obj $(FDLIBM_DIST)e_sinh.obj $(FDLIBM_DIST)e_sqrt.obj \
-  $(FDLIBM_DIST)k_cos.obj $(FDLIBM_DIST)k_rem_pio2.obj $(FDLIBM_DIST)k_sin.obj $(FDLIBM_DIST)k_standard.obj \
-  $(FDLIBM_DIST)k_tan.obj $(FDLIBM_DIST)s_asinh.obj $(FDLIBM_DIST)s_atan.obj $(FDLIBM_DIST)s_cbrt.obj \
-  $(FDLIBM_DIST)s_ceil.obj $(FDLIBM_DIST)s_copysign.obj $(FDLIBM_DIST)s_cos.obj $(FDLIBM_DIST)s_erf.obj \
-  $(FDLIBM_DIST)s_expm1.obj $(FDLIBM_DIST)s_fabs.obj $(FDLIBM_DIST)s_finite.obj $(FDLIBM_DIST)s_floor.obj \
-  $(FDLIBM_DIST)s_frexp.obj $(FDLIBM_DIST)s_ilogb.obj $(FDLIBM_DIST)s_isnan.obj $(FDLIBM_DIST)s_ldexp.obj \
-  $(SHAREDSUB)s_lib_version.obj \
-  $(FDLIBM_DIST)s_log1p.obj $(FDLIBM_DIST)s_logb.obj $(FDLIBM_DIST)s_matherr.obj \
-  $(FDLIBM_DIST)s_modf.obj $(FDLIBM_DIST)s_nextafter.obj $(FDLIBM_DIST)s_rint.obj $(FDLIBM_DIST)s_scalbn.obj \
-  $(FDLIBM_DIST)s_signgam.obj $(FDLIBM_DIST)s_significand.obj $(FDLIBM_DIST)s_sin.obj $(FDLIBM_DIST)s_tan.obj \
-  $(FDLIBM_DIST)s_tanh.obj $(FDLIBM_DIST)w_acos.obj $(FDLIBM_DIST)w_acosh.obj $(FDLIBM_DIST)w_asin.obj \
-  $(FDLIBM_DIST)w_atan2.obj $(FDLIBM_DIST)w_atanh.obj $(FDLIBM_DIST)w_cosh.obj $(FDLIBM_DIST)w_exp.obj \
-  $(FDLIBM_DIST)w_fmod.obj $(FDLIBM_DIST)w_gamma.obj $(FDLIBM_DIST)w_gamma_r.obj $(FDLIBM_DIST)w_hypot.obj \
-  $(FDLIBM_DIST)w_j0.obj $(FDLIBM_DIST)w_j1.obj $(FDLIBM_DIST)w_jn.obj $(FDLIBM_DIST)w_lgamma.obj \
-  $(FDLIBM_DIST)w_lgamma_r.obj $(FDLIBM_DIST)w_log.obj $(FDLIBM_DIST)w_log10.obj $(FDLIBM_DIST)w_pow.obj \
-  $(FDLIBM_DIST)w_remainder.obj $(FDLIBM_DIST)w_scalb.obj $(FDLIBM_DIST)w_sinh.obj $(FDLIBM_DIST)w_sqrt.obj
-
-HYCFLAGS = -Oityb1 -W3 -Fd$(LIBPATH)hyfdlibm.pdb -D_IEEE_LIBM \
-	 -DHY_PLATFORM_DOUBLE_ORDER /I$(SHAREDSUB) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include
-
-.c.obj:
-        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.c
-
-$(LIBPATH)$(LIBNAME): $(BUILDFILES)
-	@echo /NOLOGO -out:$(LIBNAME) >templrf
-	@echo $(BUILDFILES) >>templrf
-	$(implib) @templrf
-	@del templrf
-
-clean:
-	-del *.obj dist\*.obj
-	-del $(LIBNAME)
-	-del $(LIBPATH)hyfdlibm.pdb
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+#
+# Makefile for module 'fdlibm'
+#
+
+!include <$(HY_HDK)\build\make\defines.mak>
+
+LIBNAME=$(LIBPATH)hyfdlibm.lib
+
+FDLIBM_DIST=..\..\fdlibm_dist\# Comment to stop line continuation
+
+BUILDFILES = \
+  $(FDLIBM_DIST)e_acos.obj $(FDLIBM_DIST)e_acosh.obj $(FDLIBM_DIST)e_asin.obj $(FDLIBM_DIST)e_atan2.obj \
+  $(FDLIBM_DIST)e_atanh.obj $(FDLIBM_DIST)e_cosh.obj $(FDLIBM_DIST)e_exp.obj $(FDLIBM_DIST)e_fmod.obj \
+  $(FDLIBM_DIST)e_gamma.obj $(FDLIBM_DIST)e_gamma_r.obj $(FDLIBM_DIST)e_hypot.obj $(FDLIBM_DIST)e_j0.obj \
+  $(FDLIBM_DIST)e_j1.obj $(FDLIBM_DIST)e_jn.obj $(FDLIBM_DIST)e_lgamma.obj $(FDLIBM_DIST)e_lgamma_r.obj \
+  $(FDLIBM_DIST)e_log.obj $(FDLIBM_DIST)e_log10.obj $(FDLIBM_DIST)e_pow.obj $(FDLIBM_DIST)e_rem_pio2.obj \
+  $(FDLIBM_DIST)e_remainder.obj $(FDLIBM_DIST)e_scalb.obj $(FDLIBM_DIST)e_sinh.obj $(FDLIBM_DIST)e_sqrt.obj \
+  $(FDLIBM_DIST)k_cos.obj $(FDLIBM_DIST)k_rem_pio2.obj $(FDLIBM_DIST)k_sin.obj $(FDLIBM_DIST)k_standard.obj \
+  $(FDLIBM_DIST)k_tan.obj $(FDLIBM_DIST)s_asinh.obj $(FDLIBM_DIST)s_atan.obj $(FDLIBM_DIST)s_cbrt.obj \
+  $(FDLIBM_DIST)s_ceil.obj $(FDLIBM_DIST)s_copysign.obj $(FDLIBM_DIST)s_cos.obj $(FDLIBM_DIST)s_erf.obj \
+  $(FDLIBM_DIST)s_expm1.obj $(FDLIBM_DIST)s_fabs.obj $(FDLIBM_DIST)s_finite.obj $(FDLIBM_DIST)s_floor.obj \
+  $(FDLIBM_DIST)s_frexp.obj $(FDLIBM_DIST)s_ilogb.obj $(FDLIBM_DIST)s_isnan.obj $(FDLIBM_DIST)s_ldexp.obj \
+  $(SHAREDSUB)s_lib_version.obj \
+  $(FDLIBM_DIST)s_log1p.obj $(FDLIBM_DIST)s_logb.obj $(FDLIBM_DIST)s_matherr.obj \
+  $(FDLIBM_DIST)s_modf.obj $(FDLIBM_DIST)s_nextafter.obj $(FDLIBM_DIST)s_rint.obj $(FDLIBM_DIST)s_scalbn.obj \
+  $(FDLIBM_DIST)s_signgam.obj $(FDLIBM_DIST)s_significand.obj $(FDLIBM_DIST)s_sin.obj $(FDLIBM_DIST)s_tan.obj \
+  $(FDLIBM_DIST)s_tanh.obj $(FDLIBM_DIST)w_acos.obj $(FDLIBM_DIST)w_acosh.obj $(FDLIBM_DIST)w_asin.obj \
+  $(FDLIBM_DIST)w_atan2.obj $(FDLIBM_DIST)w_atanh.obj $(FDLIBM_DIST)w_cosh.obj $(FDLIBM_DIST)w_exp.obj \
+  $(FDLIBM_DIST)w_fmod.obj $(FDLIBM_DIST)w_gamma.obj $(FDLIBM_DIST)w_gamma_r.obj $(FDLIBM_DIST)w_hypot.obj \
+  $(FDLIBM_DIST)w_j0.obj $(FDLIBM_DIST)w_j1.obj $(FDLIBM_DIST)w_jn.obj $(FDLIBM_DIST)w_lgamma.obj \
+  $(FDLIBM_DIST)w_lgamma_r.obj $(FDLIBM_DIST)w_log.obj $(FDLIBM_DIST)w_log10.obj $(FDLIBM_DIST)w_pow.obj \
+  $(FDLIBM_DIST)w_remainder.obj $(FDLIBM_DIST)w_scalb.obj $(FDLIBM_DIST)w_sinh.obj $(FDLIBM_DIST)w_sqrt.obj
+
+HYCFLAGS = -Oityb1 -W3 -Fd$(LIBPATH)hyfdlibm.pdb -D_IEEE_LIBM \
+	 -DHY_PLATFORM_DOUBLE_ORDER /I$(SHAREDSUB) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include
+
+.c.obj:
+        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.c
+
+$(LIBPATH)$(LIBNAME): $(BUILDFILES)
+	@echo /NOLOGO -out:$(LIBNAME) >templrf
+	@echo $(BUILDFILES) >>templrf
+	$(implib) @templrf
+	@del templrf
+
+clean:
+	-del *.obj dist\*.obj
+	-del $(LIBNAME)
+	-del $(LIBPATH)hyfdlibm.pdb

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/windows/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile Wed Nov 22 01:37:36 2006
@@ -1,29 +1,29 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-#
-# Makefile for 'launcher'
-#
-
-include $(HY_HDK)/build/make/makefile.include
-
-BUILDFILES = $(SHAREDSUB)main.o $(SHAREDSUB)cmain.o \
-	$(SHAREDSUB)launcher_copyright.o $(SHAREDSUB)strbuf.o \
-	$(SHAREDSUB)libhlp.o  
-MDLLIBFILES = $(LIBPATH)libhycommon.a $(DLLPATH)libhyprt.so \
-	$(DLLPATH)libhythr.so $(DLLPATH)libhysig.so
-EXENAME = $(EXEPATH)java
-
-include $(HY_HDK)/build/make/rules.mk
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+#
+# Makefile for 'launcher'
+#
+
+include $(HY_HDK)/build/make/makefile.include
+
+BUILDFILES = $(SHAREDSUB)main.o $(SHAREDSUB)cmain.o \
+	$(SHAREDSUB)launcher_copyright.o $(SHAREDSUB)strbuf.o \
+	$(SHAREDSUB)libhlp.o  
+MDLLIBFILES = $(LIBPATH)libhycommon.a $(DLLPATH)libhyprt.so \
+	$(DLLPATH)libhythr.so $(DLLPATH)libhysig.so
+EXENAME = $(EXEPATH)java
+
+include $(HY_HDK)/build/make/rules.mk

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile Wed Nov 22 01:37:36 2006
@@ -1,26 +1,26 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-#
-# Makefile for module 'launcher'
-#
-
-all: 
-	$(MAKE) /NOLOGO -f makefile.javae
-	$(MAKE) /NOLOGO -f makefile.javaw
-
-clean:
-	$(MAKE) /NOLOGO -f makefile.javae clean
-	$(MAKE) /NOLOGO -f makefile.javaw clean
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+#
+# Makefile for module 'launcher'
+#
+
+all: 
+	$(MAKE) /NOLOGO -f makefile.javae
+	$(MAKE) /NOLOGO -f makefile.javaw
+
+clean:
+	$(MAKE) /NOLOGO -f makefile.javae clean
+	$(MAKE) /NOLOGO -f makefile.javaw clean

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/libhyluni.exp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/libhyluni.exp?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/libhyluni.exp (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/libhyluni.exp Wed Nov 22 01:37:36 2006
@@ -1,248 +1,248 @@
-HYLUNI_0.1 {
-	global :
-		Java_org_apache_harmony_luni_internal_process_ProcessInputStream_availableImpl;
-		Java_org_apache_harmony_luni_internal_process_ProcessInputStream_closeImpl;
-		Java_org_apache_harmony_luni_internal_process_ProcessInputStream_oneTimeInitialization;
-		Java_org_apache_harmony_luni_internal_process_ProcessInputStream_readImpl;
-		Java_org_apache_harmony_luni_internal_process_ProcessInputStream_setFDImpl;
-		Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_closeImpl;
-		Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_oneTimeInitialization;
-		Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_setFDImpl;
-		Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_writeImpl;
-		Java_org_apache_harmony_luni_internal_process_SystemProcess_closeImpl;
-		Java_org_apache_harmony_luni_internal_process_SystemProcess_createImpl;
-		Java_org_apache_harmony_luni_internal_process_SystemProcess_destroyImpl;
-		Java_org_apache_harmony_luni_internal_process_SystemProcess_oneTimeInitialization;
-		Java_org_apache_harmony_luni_internal_process_SystemProcess_waitForCompletionImpl;
-		Java_org_apache_harmony_math_util_BigInteger_addImpl;
-		Java_org_apache_harmony_math_util_BigInteger_compImpl;
-		Java_org_apache_harmony_math_util_BigInteger_divImpl;
-		Java_org_apache_harmony_math_util_BigInteger_mulImpl;
-		Java_org_apache_harmony_math_util_BigInteger_negImpl;
-		Java_org_apache_harmony_math_util_BigInteger_remImpl;
-		Java_org_apache_harmony_math_util_BigInteger_shlImpl;
-		Java_org_apache_harmony_math_util_BigInteger_subImpl;
-		Java_java_io_File_deleteDirImpl;
-		Java_java_io_File_deleteFileImpl;
-		Java_java_io_File_existsImpl;
-		Java_java_io_File_getCanonImpl;
-		Java_java_io_File_getLinkImpl;
-		Java_java_io_File_isAbsoluteImpl;
-		Java_java_io_File_isCaseSensitiveImpl;
-		Java_java_io_File_isDirectoryImpl;
-		Java_java_io_File_isFileImpl;
-		Java_java_io_File_isHiddenImpl;
-		Java_java_io_File_isReadOnlyImpl;
-		Java_java_io_File_isWriteOnlyImpl;
-		Java_java_io_File_lastModifiedImpl;
-		Java_java_io_File_lengthImpl;
-		Java_java_io_File_listImpl;
-		Java_java_io_File_mkdirImpl;
-		Java_java_io_File_newFileImpl;
-		Java_java_io_File_oneTimeInitialization;
-		Java_java_io_File_properPathImpl;
-		Java_java_io_File_renameToImpl;
-		Java_java_io_File_rootsImpl;
-		Java_java_io_File_setLastModifiedImpl;
-		Java_java_io_File_setReadOnlyImpl;
-		Java_java_io_FileDescriptor_oneTimeInitialization;
-		Java_java_io_FileDescriptor_sync;
-		Java_java_io_FileDescriptor_valid;
-		Java_java_io_FileInputStream_available;
-		Java_java_io_FileInputStream_closeImpl;
-		Java_java_io_FileInputStream_oneTimeInitialization;
-		Java_java_io_FileInputStream_openImpl;
-		Java_java_io_FileInputStream_readByteImpl;
-		Java_java_io_FileInputStream_readImpl;
-		Java_java_io_FileInputStream_skip;
-		Java_java_io_FileOutputStream_closeImpl;
-		Java_java_io_FileOutputStream_oneTimeInitialization;
-		Java_java_io_FileOutputStream_openImpl;
-		Java_java_io_FileOutputStream_writeByteImpl;
-		Java_java_io_FileOutputStream_writeImpl;
-		Java_java_io_ObjectInputStream_newInstance;
-		Java_java_io_ObjectInputStream_objSetField;
-		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2B;
-		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2C;
-		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2D;
-		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2F;
-		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2I;
-		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2J;
-		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2S;
-		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2Z;
-		Java_java_io_ObjectOutputStream_getFieldBool;
-		Java_java_io_ObjectOutputStream_getFieldByte;
-		Java_java_io_ObjectOutputStream_getFieldChar;
-		Java_java_io_ObjectOutputStream_getFieldDouble;
-		Java_java_io_ObjectOutputStream_getFieldFloat;
-		Java_java_io_ObjectOutputStream_getFieldInt;
-		Java_java_io_ObjectOutputStream_getFieldLong;
-		Java_java_io_ObjectOutputStream_getFieldObj;
-		Java_java_io_ObjectOutputStream_getFieldShort;
-		Java_java_io_ObjectStreamClass_getConstructorSignature;
-		Java_java_io_ObjectStreamClass_getFieldSignature;
-		Java_java_io_ObjectStreamClass_getMethodSignature;
-		Java_java_io_ObjectStreamClass_hasClinit;
-		Java_java_io_ObjectStreamClass_oneTimeInitialization;
-		Java_java_lang_Double_doubleToLongBits;
-		Java_java_lang_Double_doubleToRawLongBits;
-		Java_java_lang_Double_longBitsToDouble;
-		Java_java_lang_Float_floatToIntBits;
-		Java_java_lang_Float_floatToRawIntBits;
-		Java_java_lang_Float_intBitsToFloat;
-		Java_java_lang_Math_acos;
-		Java_java_lang_Math_asin;
-		Java_java_lang_Math_atan;
-		Java_java_lang_Math_atan2;
-		Java_java_lang_Math_cbrt;
-		Java_java_lang_Math_ceil;
-		Java_java_lang_Math_cos;
-		Java_java_lang_Math_cosh;
-		Java_java_lang_Math_exp;
-		Java_java_lang_Math_expm1;
-		Java_java_lang_Math_floor;
-		Java_java_lang_Math_hypot;
-		Java_java_lang_Math_IEEEremainder;
-		Java_java_lang_Math_log;
-		Java_java_lang_Math_log10;
-		Java_java_lang_Math_log1p;
-		Java_java_lang_Math_nextafter;
-		Java_java_lang_Math_nextafterf;
-		Java_java_lang_Math_pow;
-		Java_java_lang_Math_rint;
-		Java_java_lang_Math_sin;
-		Java_java_lang_Math_sinh;
-		Java_java_lang_Math_sqrt;
-		Java_java_lang_Math_tan;
-		Java_java_lang_Math_tanh;
-		Java_java_lang_reflect_Proxy_defineClassImpl;
-		Java_java_lang_StrictMath_acos;
-		Java_java_lang_StrictMath_asin;
-		Java_java_lang_StrictMath_atan;
-		Java_java_lang_StrictMath_atan2;
-		Java_java_lang_StrictMath_cbrt;
-		Java_java_lang_StrictMath_ceil;
-		Java_java_lang_StrictMath_cos;
-		Java_java_lang_StrictMath_cosh;
-		Java_java_lang_StrictMath_exp;
-		Java_java_lang_StrictMath_expm1;
-		Java_java_lang_StrictMath_floor;
-		Java_java_lang_StrictMath_hypot;
-		Java_java_lang_StrictMath_IEEEremainder;
-		Java_java_lang_StrictMath_log;
-		Java_java_lang_StrictMath_log10;
-		Java_java_lang_StrictMath_log1p;
-		Java_java_lang_StrictMath_nextafter;
-		Java_java_lang_StrictMath_nextafterf;
-		Java_java_lang_StrictMath_pow;
-		Java_java_lang_StrictMath_rint;
-		Java_java_lang_StrictMath_sin;
-		Java_java_lang_StrictMath_sinh;
-		Java_java_lang_StrictMath_sqrt;
-		Java_java_lang_StrictMath_tan;
-		Java_java_lang_StrictMath_tanh;
-		Java_java_net_InetAddress_getAliasesByNameImpl;
-		Java_java_net_InetAddress_getHostByAddrImpl;
-		Java_java_net_InetAddress_getHostByNameImpl;
-		Java_java_net_InetAddress_getHostNameImpl;
-		Java_java_net_InetAddress_inetAddrImpl;
-		Java_java_net_InetAddress_inetNtoaImpl;
-		Java_java_net_InetAddress_oneTimeInitialization;
-		Java_java_net_NetworkInterface_getNetworkInterfacesImpl;
-		Java_java_util_TimeZone_getCustomTimeZone;
-		JNI_OnLoad;
-		JNI_OnUnload;
-		Java_org_apache_harmony_luni_util_FloatingPointParser_parseDblImpl;
-		Java_org_apache_harmony_luni_util_FloatingPointParser_parseFltImpl;
-		Java_org_apache_harmony_luni_util_NumberConverter_bigIntDigitGeneratorInstImpl;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_truncateImpl;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_getPageSize;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_writevImpl;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_readvImpl;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_writeImpl;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_openImpl;	
-		Java_org_apache_harmony_luni_platform_OSFileSystem_readDirectImpl;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_writeDirectImpl;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_readImpl;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_seekImpl;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_fflushImpl;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_closeImpl;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_lockImpl;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_unlockImpl;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_transferImpl;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_ttyAvailableImpl;
-		Java_org_apache_harmony_luni_platform_OSFileSystem_ttyReadImpl;
-		Java_org_apache_harmony_luni_platform_OSMemory_isLoadedImpl;
-		Java_org_apache_harmony_luni_platform_OSMemory_loadImpl;
-		Java_org_apache_harmony_luni_platform_OSMemory_mmapImpl;
-		Java_org_apache_harmony_luni_platform_OSMemory_unmapImpl;
-		Java_org_apache_harmony_luni_platform_OSMemory_flushImpl;
-		Java_org_apache_harmony_luni_platform_OSMemory_isLittleEndianImpl;
-		Java_org_apache_harmony_luni_platform_OSMemory_getPointerSizeImpl;
-		Java_org_apache_harmony_luni_platform_OSMemory_getAddress;
-		Java_org_apache_harmony_luni_platform_OSMemory_setAddress;
-		Java_org_apache_harmony_luni_platform_OSMemory_malloc;
-		Java_org_apache_harmony_luni_platform_OSMemory_free;
-		Java_org_apache_harmony_luni_platform_OSMemory_memmove;
-		Java_org_apache_harmony_luni_platform_OSMemory_memset;
-		Java_org_apache_harmony_luni_platform_OSMemory_getByteArray;
-		Java_org_apache_harmony_luni_platform_OSMemory_setByteArray;
-		Java_org_apache_harmony_luni_platform_OSMemory_getByte;
-		Java_org_apache_harmony_luni_platform_OSMemory_setByte;
-		Java_org_apache_harmony_luni_platform_OSMemory_getShort;
-		Java_org_apache_harmony_luni_platform_OSMemory_setShort;
-		Java_org_apache_harmony_luni_platform_OSMemory_getInt;
-		Java_org_apache_harmony_luni_platform_OSMemory_setInt;
-		Java_org_apache_harmony_luni_platform_OSMemory_getLong;
-		Java_org_apache_harmony_luni_platform_OSMemory_setLong;
-		Java_org_apache_harmony_luni_platform_OSMemory_getFloat;
-		Java_org_apache_harmony_luni_platform_OSMemory_setFloat;
-		Java_org_apache_harmony_luni_platform_OSMemory_getDouble;
-		Java_org_apache_harmony_luni_platform_OSMemory_setDouble;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_createSocketImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_createDatagramSocketImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_readSocketImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_writeSocketImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_setNonBlockingImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_connectSocketImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_connectWithTimeoutSocketImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_connectStreamWithTimeoutSocketImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_socketBindImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_listenStreamSocketImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_availableStreamImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_acceptSocketImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_supportsUrgentDataImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_sendUrgentDataImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_connectDatagramImpl2;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_disconnectDatagramImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_socketBindImpl2;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_peekDatagramImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_receiveDatagramImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_recvConnectedDatagramImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_sendDatagramImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_sendConnectedDatagramImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_createServerStreamSocketImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_createMulticastSocketImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_receiveStreamImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_sendStreamImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_shutdownInputImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_shutdownOutputImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_acceptStreamSocketImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_createStreamSocketImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_sendDatagramImpl2;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_selectImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_getSocketLocalAddressImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_getSocketLocalPortImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_getSocketOptionImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_setSocketOptionImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_getSocketFlagsImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_socketCloseImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_getHostByAddrImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_getHostByNameImpl;
-		Java_org_apache_harmony_luni_platform_OSNetworkSystem_setInetAddressImpl;
-        Java_org_apache_harmony_luni_platform_OSNetworkSystem_isReachableByICMPImpl;
-        Java_org_apache_harmony_luni_platform_OSNetworkSystem_inheritedChannelImpl;
-	Java_org_apache_harmony_luni_platform_Environment_getEnvBytes;
-	Java_org_apache_harmony_luni_platform_Environment_getEnvByName;
-	local : *;
-};
+HYLUNI_0.1 {
+	global :
+		Java_org_apache_harmony_luni_internal_process_ProcessInputStream_availableImpl;
+		Java_org_apache_harmony_luni_internal_process_ProcessInputStream_closeImpl;
+		Java_org_apache_harmony_luni_internal_process_ProcessInputStream_oneTimeInitialization;
+		Java_org_apache_harmony_luni_internal_process_ProcessInputStream_readImpl;
+		Java_org_apache_harmony_luni_internal_process_ProcessInputStream_setFDImpl;
+		Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_closeImpl;
+		Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_oneTimeInitialization;
+		Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_setFDImpl;
+		Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_writeImpl;
+		Java_org_apache_harmony_luni_internal_process_SystemProcess_closeImpl;
+		Java_org_apache_harmony_luni_internal_process_SystemProcess_createImpl;
+		Java_org_apache_harmony_luni_internal_process_SystemProcess_destroyImpl;
+		Java_org_apache_harmony_luni_internal_process_SystemProcess_oneTimeInitialization;
+		Java_org_apache_harmony_luni_internal_process_SystemProcess_waitForCompletionImpl;
+		Java_org_apache_harmony_math_util_BigInteger_addImpl;
+		Java_org_apache_harmony_math_util_BigInteger_compImpl;
+		Java_org_apache_harmony_math_util_BigInteger_divImpl;
+		Java_org_apache_harmony_math_util_BigInteger_mulImpl;
+		Java_org_apache_harmony_math_util_BigInteger_negImpl;
+		Java_org_apache_harmony_math_util_BigInteger_remImpl;
+		Java_org_apache_harmony_math_util_BigInteger_shlImpl;
+		Java_org_apache_harmony_math_util_BigInteger_subImpl;
+		Java_java_io_File_deleteDirImpl;
+		Java_java_io_File_deleteFileImpl;
+		Java_java_io_File_existsImpl;
+		Java_java_io_File_getCanonImpl;
+		Java_java_io_File_getLinkImpl;
+		Java_java_io_File_isAbsoluteImpl;
+		Java_java_io_File_isCaseSensitiveImpl;
+		Java_java_io_File_isDirectoryImpl;
+		Java_java_io_File_isFileImpl;
+		Java_java_io_File_isHiddenImpl;
+		Java_java_io_File_isReadOnlyImpl;
+		Java_java_io_File_isWriteOnlyImpl;
+		Java_java_io_File_lastModifiedImpl;
+		Java_java_io_File_lengthImpl;
+		Java_java_io_File_listImpl;
+		Java_java_io_File_mkdirImpl;
+		Java_java_io_File_newFileImpl;
+		Java_java_io_File_oneTimeInitialization;
+		Java_java_io_File_properPathImpl;
+		Java_java_io_File_renameToImpl;
+		Java_java_io_File_rootsImpl;
+		Java_java_io_File_setLastModifiedImpl;
+		Java_java_io_File_setReadOnlyImpl;
+		Java_java_io_FileDescriptor_oneTimeInitialization;
+		Java_java_io_FileDescriptor_sync;
+		Java_java_io_FileDescriptor_valid;
+		Java_java_io_FileInputStream_available;
+		Java_java_io_FileInputStream_closeImpl;
+		Java_java_io_FileInputStream_oneTimeInitialization;
+		Java_java_io_FileInputStream_openImpl;
+		Java_java_io_FileInputStream_readByteImpl;
+		Java_java_io_FileInputStream_readImpl;
+		Java_java_io_FileInputStream_skip;
+		Java_java_io_FileOutputStream_closeImpl;
+		Java_java_io_FileOutputStream_oneTimeInitialization;
+		Java_java_io_FileOutputStream_openImpl;
+		Java_java_io_FileOutputStream_writeByteImpl;
+		Java_java_io_FileOutputStream_writeImpl;
+		Java_java_io_ObjectInputStream_newInstance;
+		Java_java_io_ObjectInputStream_objSetField;
+		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2B;
+		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2C;
+		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2D;
+		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2F;
+		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2I;
+		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2J;
+		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2S;
+		Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2Z;
+		Java_java_io_ObjectOutputStream_getFieldBool;
+		Java_java_io_ObjectOutputStream_getFieldByte;
+		Java_java_io_ObjectOutputStream_getFieldChar;
+		Java_java_io_ObjectOutputStream_getFieldDouble;
+		Java_java_io_ObjectOutputStream_getFieldFloat;
+		Java_java_io_ObjectOutputStream_getFieldInt;
+		Java_java_io_ObjectOutputStream_getFieldLong;
+		Java_java_io_ObjectOutputStream_getFieldObj;
+		Java_java_io_ObjectOutputStream_getFieldShort;
+		Java_java_io_ObjectStreamClass_getConstructorSignature;
+		Java_java_io_ObjectStreamClass_getFieldSignature;
+		Java_java_io_ObjectStreamClass_getMethodSignature;
+		Java_java_io_ObjectStreamClass_hasClinit;
+		Java_java_io_ObjectStreamClass_oneTimeInitialization;
+		Java_java_lang_Double_doubleToLongBits;
+		Java_java_lang_Double_doubleToRawLongBits;
+		Java_java_lang_Double_longBitsToDouble;
+		Java_java_lang_Float_floatToIntBits;
+		Java_java_lang_Float_floatToRawIntBits;
+		Java_java_lang_Float_intBitsToFloat;
+		Java_java_lang_Math_acos;
+		Java_java_lang_Math_asin;
+		Java_java_lang_Math_atan;
+		Java_java_lang_Math_atan2;
+		Java_java_lang_Math_cbrt;
+		Java_java_lang_Math_ceil;
+		Java_java_lang_Math_cos;
+		Java_java_lang_Math_cosh;
+		Java_java_lang_Math_exp;
+		Java_java_lang_Math_expm1;
+		Java_java_lang_Math_floor;
+		Java_java_lang_Math_hypot;
+		Java_java_lang_Math_IEEEremainder;
+		Java_java_lang_Math_log;
+		Java_java_lang_Math_log10;
+		Java_java_lang_Math_log1p;
+		Java_java_lang_Math_nextafter;
+		Java_java_lang_Math_nextafterf;
+		Java_java_lang_Math_pow;
+		Java_java_lang_Math_rint;
+		Java_java_lang_Math_sin;
+		Java_java_lang_Math_sinh;
+		Java_java_lang_Math_sqrt;
+		Java_java_lang_Math_tan;
+		Java_java_lang_Math_tanh;
+		Java_java_lang_reflect_Proxy_defineClassImpl;
+		Java_java_lang_StrictMath_acos;
+		Java_java_lang_StrictMath_asin;
+		Java_java_lang_StrictMath_atan;
+		Java_java_lang_StrictMath_atan2;
+		Java_java_lang_StrictMath_cbrt;
+		Java_java_lang_StrictMath_ceil;
+		Java_java_lang_StrictMath_cos;
+		Java_java_lang_StrictMath_cosh;
+		Java_java_lang_StrictMath_exp;
+		Java_java_lang_StrictMath_expm1;
+		Java_java_lang_StrictMath_floor;
+		Java_java_lang_StrictMath_hypot;
+		Java_java_lang_StrictMath_IEEEremainder;
+		Java_java_lang_StrictMath_log;
+		Java_java_lang_StrictMath_log10;
+		Java_java_lang_StrictMath_log1p;
+		Java_java_lang_StrictMath_nextafter;
+		Java_java_lang_StrictMath_nextafterf;
+		Java_java_lang_StrictMath_pow;
+		Java_java_lang_StrictMath_rint;
+		Java_java_lang_StrictMath_sin;
+		Java_java_lang_StrictMath_sinh;
+		Java_java_lang_StrictMath_sqrt;
+		Java_java_lang_StrictMath_tan;
+		Java_java_lang_StrictMath_tanh;
+		Java_java_net_InetAddress_getAliasesByNameImpl;
+		Java_java_net_InetAddress_getHostByAddrImpl;
+		Java_java_net_InetAddress_getHostByNameImpl;
+		Java_java_net_InetAddress_getHostNameImpl;
+		Java_java_net_InetAddress_inetAddrImpl;
+		Java_java_net_InetAddress_inetNtoaImpl;
+		Java_java_net_InetAddress_oneTimeInitialization;
+		Java_java_net_NetworkInterface_getNetworkInterfacesImpl;
+		Java_java_util_TimeZone_getCustomTimeZone;
+		JNI_OnLoad;
+		JNI_OnUnload;
+		Java_org_apache_harmony_luni_util_FloatingPointParser_parseDblImpl;
+		Java_org_apache_harmony_luni_util_FloatingPointParser_parseFltImpl;
+		Java_org_apache_harmony_luni_util_NumberConverter_bigIntDigitGeneratorInstImpl;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_truncateImpl;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_getPageSize;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_writevImpl;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_readvImpl;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_writeImpl;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_openImpl;	
+		Java_org_apache_harmony_luni_platform_OSFileSystem_readDirectImpl;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_writeDirectImpl;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_readImpl;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_seekImpl;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_fflushImpl;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_closeImpl;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_lockImpl;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_unlockImpl;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_transferImpl;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_ttyAvailableImpl;
+		Java_org_apache_harmony_luni_platform_OSFileSystem_ttyReadImpl;
+		Java_org_apache_harmony_luni_platform_OSMemory_isLoadedImpl;
+		Java_org_apache_harmony_luni_platform_OSMemory_loadImpl;
+		Java_org_apache_harmony_luni_platform_OSMemory_mmapImpl;
+		Java_org_apache_harmony_luni_platform_OSMemory_unmapImpl;
+		Java_org_apache_harmony_luni_platform_OSMemory_flushImpl;
+		Java_org_apache_harmony_luni_platform_OSMemory_isLittleEndianImpl;
+		Java_org_apache_harmony_luni_platform_OSMemory_getPointerSizeImpl;
+		Java_org_apache_harmony_luni_platform_OSMemory_getAddress;
+		Java_org_apache_harmony_luni_platform_OSMemory_setAddress;
+		Java_org_apache_harmony_luni_platform_OSMemory_malloc;
+		Java_org_apache_harmony_luni_platform_OSMemory_free;
+		Java_org_apache_harmony_luni_platform_OSMemory_memmove;
+		Java_org_apache_harmony_luni_platform_OSMemory_memset;
+		Java_org_apache_harmony_luni_platform_OSMemory_getByteArray;
+		Java_org_apache_harmony_luni_platform_OSMemory_setByteArray;
+		Java_org_apache_harmony_luni_platform_OSMemory_getByte;
+		Java_org_apache_harmony_luni_platform_OSMemory_setByte;
+		Java_org_apache_harmony_luni_platform_OSMemory_getShort;
+		Java_org_apache_harmony_luni_platform_OSMemory_setShort;
+		Java_org_apache_harmony_luni_platform_OSMemory_getInt;
+		Java_org_apache_harmony_luni_platform_OSMemory_setInt;
+		Java_org_apache_harmony_luni_platform_OSMemory_getLong;
+		Java_org_apache_harmony_luni_platform_OSMemory_setLong;
+		Java_org_apache_harmony_luni_platform_OSMemory_getFloat;
+		Java_org_apache_harmony_luni_platform_OSMemory_setFloat;
+		Java_org_apache_harmony_luni_platform_OSMemory_getDouble;
+		Java_org_apache_harmony_luni_platform_OSMemory_setDouble;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_createSocketImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_createDatagramSocketImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_readSocketImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_writeSocketImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_setNonBlockingImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_connectSocketImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_connectWithTimeoutSocketImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_connectStreamWithTimeoutSocketImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_socketBindImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_listenStreamSocketImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_availableStreamImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_acceptSocketImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_supportsUrgentDataImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_sendUrgentDataImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_connectDatagramImpl2;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_disconnectDatagramImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_socketBindImpl2;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_peekDatagramImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_receiveDatagramImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_recvConnectedDatagramImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_sendDatagramImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_sendConnectedDatagramImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_createServerStreamSocketImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_createMulticastSocketImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_receiveStreamImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_sendStreamImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_shutdownInputImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_shutdownOutputImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_acceptStreamSocketImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_createStreamSocketImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_sendDatagramImpl2;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_selectImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_getSocketLocalAddressImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_getSocketLocalPortImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_getSocketOptionImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_setSocketOptionImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_getSocketFlagsImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_socketCloseImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_getHostByAddrImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_getHostByNameImpl;
+		Java_org_apache_harmony_luni_platform_OSNetworkSystem_setInetAddressImpl;
+        Java_org_apache_harmony_luni_platform_OSNetworkSystem_isReachableByICMPImpl;
+        Java_org_apache_harmony_luni_platform_OSNetworkSystem_inheritedChannelImpl;
+	Java_org_apache_harmony_luni_platform_Environment_getEnvBytes;
+	Java_org_apache_harmony_luni_platform_Environment_getEnvByName;
+	local : *;
+};

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/libhyluni.exp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile Wed Nov 22 01:37:36 2006
@@ -1,45 +1,45 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-#
-# Makefile for module 'luni'
-#
-
-include $(HY_HDK)/build/make/makefile.include
-
-# CFLAGS += -fpic -Wall -Werror 
-CFLAGS += -fpic -Wall
-
-BUILDFILES = \
-	$(SHAREDSUB)luni_copyright.o $(SHAREDSUB)file.o procimpl.o \
-	$(SHAREDSUB)oos.o $(SHAREDSUB)nethelp.o \
-	$(SHAREDSUB)floatbits.o $(SHAREDSUB)ois.o \
-	helpers.o $(SHAREDSUB)math.o $(SHAREDSUB)luniglob.o \
-	$(SHAREDSUB)proxy.o \
-	$(SHAREDSUB)cbigint.o $(SHAREDSUB)dblparse.o $(SHAREDSUB)fltparse.o \
-	$(SHAREDSUB)netif.o $(SHAREDSUB)process.o $(SHAREDSUB)bigint.o \
-	$(SHAREDSUB)osc.o $(SHAREDSUB)socket.o $(SHAREDSUB)inetadds.o \
-	$(SHAREDSUB)filedesc.o $(SHAREDSUB)timezone.o \
-	$(SHAREDSUB)OSFileSystem.o OSFileSystemLinux32.o \
-	OSMemory.o OSMemoryLinux32.o $(SHAREDSUB)OSNetworkSystem.o \
-	OSNetworkSystemLinux.o hyenv.o
-
-MDLLIBFILES = \
-	$(LIBPATH)libhycommon.a $(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
-
-DLLNAME = ../libhyluni.so
-
-include $(HY_HDK)/build/make/rules.mk
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+#
+# Makefile for module 'luni'
+#
+
+include $(HY_HDK)/build/make/makefile.include
+
+# CFLAGS += -fpic -Wall -Werror 
+CFLAGS += -fpic -Wall
+
+BUILDFILES = \
+	$(SHAREDSUB)luni_copyright.o $(SHAREDSUB)file.o procimpl.o \
+	$(SHAREDSUB)oos.o $(SHAREDSUB)nethelp.o \
+	$(SHAREDSUB)floatbits.o $(SHAREDSUB)ois.o \
+	helpers.o $(SHAREDSUB)math.o $(SHAREDSUB)luniglob.o \
+	$(SHAREDSUB)proxy.o \
+	$(SHAREDSUB)cbigint.o $(SHAREDSUB)dblparse.o $(SHAREDSUB)fltparse.o \
+	$(SHAREDSUB)netif.o $(SHAREDSUB)process.o $(SHAREDSUB)bigint.o \
+	$(SHAREDSUB)osc.o $(SHAREDSUB)socket.o $(SHAREDSUB)inetadds.o \
+	$(SHAREDSUB)filedesc.o $(SHAREDSUB)timezone.o \
+	$(SHAREDSUB)OSFileSystem.o OSFileSystemLinux32.o \
+	OSMemory.o OSMemoryLinux32.o $(SHAREDSUB)OSNetworkSystem.o \
+	OSNetworkSystemLinux.o hyenv.o
+
+MDLLIBFILES = \
+	$(LIBPATH)libhycommon.a $(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+
+DLLNAME = ../libhyluni.so
+
+include $(HY_HDK)/build/make/rules.mk

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/hyenv.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/hyenv.c?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/hyenv.c (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/hyenv.c Wed Nov 22 01:37:36 2006
@@ -1,91 +1,91 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-#include <windows.h>
-#include <vmi.h>
-#include "hyenv.h"
-
-
-JNIEXPORT jbyteArray JNICALL Java_org_apache_harmony_luni_platform_Environment_getEnvBytes
-
-  (JNIEnv *env, jclass obj){ 
-  jsize len =0;
-  jbyte *buffer;
-  LPTSTR lpszVars;
-  LPVOID lpvEnv;
-  jbyteArray byteArray;
-  lpvEnv = GetEnvironmentStrings();
-  if (NULL == lpvEnv){
-    return NULL;
-  }
-  lpszVars = (LPTSTR)lpvEnv;
-  buffer = lpszVars;
-  while(*lpszVars){
-    len += strlen(lpszVars)+1;
-	lpszVars += strlen(lpszVars)+1;
-  }
-  byteArray = (*env)->NewByteArray(env,len);
-  (*env)->SetByteArrayRegion(env,byteArray, 0, len, buffer);
-  FreeEnvironmentStrings((LPTCH)lpvEnv);
-  return byteArray;
-}
-
-JNIEXPORT jbyteArray JNICALL Java_org_apache_harmony_luni_platform_Environment_getEnvByName
-  (JNIEnv *env, jclass obj, jbyteArray name){
-  DWORD dwRet,dwErr;
-  LPTSTR envvalue;
-  jsize len = 0;
-  const DWORD BUFSIZE = 1024;
-  jbyteArray byteArray = NULL;
-  char *envname;
-  PORT_ACCESS_FROM_ENV(env);
-
-  len = (*env)->GetArrayLength(env, name);
-  envname = (char *)hymem_allocate_memory(len+1);
-  (*env)->GetByteArrayRegion(env, name, 0, len,(jbyte *)envname);
-  envname[len] = 0;
-
-  envvalue = (LPTSTR)hymem_allocate_memory(BUFSIZE*sizeof(TCHAR));
-  dwRet = GetEnvironmentVariable(envname, envvalue, BUFSIZE);
-  
-  if(0 == dwRet)
-  {
-    dwErr = GetLastError();
-    if( ERROR_ENVVAR_NOT_FOUND == dwErr ){
-      goto free_resource;
-    }
-  }
-  else if(BUFSIZE < dwRet)
-  {
-    envvalue = (LPTSTR)hymem_reallocate_memory(envvalue, dwRet*sizeof(TCHAR));   
-    if(NULL == envvalue){
-      goto free_resource;
-    }
-    dwRet = GetEnvironmentVariable((LPCSTR)envname, envvalue, dwRet);
-    if(!dwRet){
-      goto free_resource;
-    }
-  }
-  
-  byteArray = (*env)->NewByteArray(env,dwRet);
-  (*env)->SetByteArrayRegion(env,byteArray, 0, dwRet, (jbyte *)envvalue);
-  free_resource:
-  hymem_free_memory(envname);
-  hymem_free_memory(envvalue);
-  return byteArray;
-}
-
-
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+#include <windows.h>
+#include <vmi.h>
+#include "hyenv.h"
+
+
+JNIEXPORT jbyteArray JNICALL Java_org_apache_harmony_luni_platform_Environment_getEnvBytes
+
+  (JNIEnv *env, jclass obj){ 
+  jsize len =0;
+  jbyte *buffer;
+  LPTSTR lpszVars;
+  LPVOID lpvEnv;
+  jbyteArray byteArray;
+  lpvEnv = GetEnvironmentStrings();
+  if (NULL == lpvEnv){
+    return NULL;
+  }
+  lpszVars = (LPTSTR)lpvEnv;
+  buffer = lpszVars;
+  while(*lpszVars){
+    len += strlen(lpszVars)+1;
+	lpszVars += strlen(lpszVars)+1;
+  }
+  byteArray = (*env)->NewByteArray(env,len);
+  (*env)->SetByteArrayRegion(env,byteArray, 0, len, buffer);
+  FreeEnvironmentStrings((LPTCH)lpvEnv);
+  return byteArray;
+}
+
+JNIEXPORT jbyteArray JNICALL Java_org_apache_harmony_luni_platform_Environment_getEnvByName
+  (JNIEnv *env, jclass obj, jbyteArray name){
+  DWORD dwRet,dwErr;
+  LPTSTR envvalue;
+  jsize len = 0;
+  const DWORD BUFSIZE = 1024;
+  jbyteArray byteArray = NULL;
+  char *envname;
+  PORT_ACCESS_FROM_ENV(env);
+
+  len = (*env)->GetArrayLength(env, name);
+  envname = (char *)hymem_allocate_memory(len+1);
+  (*env)->GetByteArrayRegion(env, name, 0, len,(jbyte *)envname);
+  envname[len] = 0;
+
+  envvalue = (LPTSTR)hymem_allocate_memory(BUFSIZE*sizeof(TCHAR));
+  dwRet = GetEnvironmentVariable(envname, envvalue, BUFSIZE);
+  
+  if(0 == dwRet)
+  {
+    dwErr = GetLastError();
+    if( ERROR_ENVVAR_NOT_FOUND == dwErr ){
+      goto free_resource;
+    }
+  }
+  else if(BUFSIZE < dwRet)
+  {
+    envvalue = (LPTSTR)hymem_reallocate_memory(envvalue, dwRet*sizeof(TCHAR));   
+    if(NULL == envvalue){
+      goto free_resource;
+    }
+    dwRet = GetEnvironmentVariable((LPCSTR)envname, envvalue, dwRet);
+    if(!dwRet){
+      goto free_resource;
+    }
+  }
+  
+  byteArray = (*env)->NewByteArray(env,dwRet);
+  (*env)->SetByteArrayRegion(env,byteArray, 0, dwRet, (jbyte *)envvalue);
+  free_resource:
+  hymem_free_memory(envname);
+  hymem_free_memory(envvalue);
+  return byteArray;
+}
+
+

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/hyenv.c
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message