# HG changeset patch
# User prr
# Date 1276884014 25200
# Node ID 34b0d2496f103fc39e038223594c3f1d805ec225
# Parent  ef19a58b3c423b18ddfaf8ad5276f7e26cbe2c69
6961633: gui applications cause a jvm crash on windows
Reviewed-by: ceisserer, bae

diff -r ef19a58b3c42 -r 34b0d2496f10 jdk/make/sun/pisces/Makefile
--- a/jdk/make/sun/pisces/Makefile	Wed Jun 16 20:46:10 2010 +0200
+++ b/jdk/make/sun/pisces/Makefile	Fri Jun 18 11:00:14 2010 -0700
@@ -52,5 +52,11 @@
 
 copy-files: $(FILES_copy)
 
-$(SERVICEDIR)/%: $(SHARE_SRC)/classes/sun/java2d/pisces/META-INF/services/%
+ifneq ($(PLATFORM), windows)
+ SERVICE_SRC = $(PLATFORM_SRC)
+else
+ SERVICE_SRC = $(SHARE_SRC)
+endif
+
+$(SERVICEDIR)/%: $(SERVICE_SRC)/classes/sun/java2d/pisces/META-INF/services/%
 	$(install-file)
diff -r ef19a58b3c42 -r 34b0d2496f10 jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine
--- a/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine	Wed Jun 16 20:46:10 2010 +0200
+++ b/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine	Fri Jun 18 11:00:14 2010 -0700
@@ -1,5 +1,2 @@
-# Jules Rendering Engine module
-sun.java2d.jules.JulesRenderingEngine
-
 #  Pisces Rendering Engine module
-sun.java2d.pisces.PiscesRenderingEngine
\ No newline at end of file
+sun.java2d.pisces.PiscesRenderingEngine
diff -r ef19a58b3c42 -r 34b0d2496f10 jdk/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine	Fri Jun 18 11:00:14 2010 -0700
@@ -0,0 +1,5 @@
+# Jules Rendering Engine module
+sun.java2d.jules.JulesRenderingEngine
+
+#  Pisces Rendering Engine module
+sun.java2d.pisces.PiscesRenderingEngine