17610 r=akhil.arora@sun.com, fix=Denis Sharypov <sdv@sparc.spb.su>

Cosmetic changes to remove warnings generated by Visual C++ compiler
Do not link with unneccessary library raptorgfx in makefile.win
Use JAVAHOME to point to JDK instead of hardcoding the path


git-svn-id: svn://10.0.0.236/trunk@52553 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/java/dom/jni/javaDOMGlobals.h

@@ -23,8 +23,8 @@ Inc. All Rights Reserved.
 
 class nsISupports;
 class nsIDOMNode;
-class PRLogModuleInfo;
-class PRLock;
+struct PRLogModuleInfo;
+struct PRLock;
 
 class JavaDOMGlobals {
 

mozilla/java/dom/jni/makefile.win

@@ -85,7 +85,6 @@ LCFLAGS = \
 # These are the libraries we need to link with to create the dll
 LLIBS= \
  $(DIST)\lib\xpcom.lib \
- $(DIST)\lib\raptorgfxwin.lib \
  $(DIST)\lib\img32$(VERSION_NUMBER).lib \
  $(DIST)\lib\util.lib \
  $(DIST)\lib\plc3.lib \

mozilla/java/dom/makefile.win

@@ -37,8 +37,8 @@ EXPORTS = \
 	nsIJavaDOM.h 
 
 LINCS= \
-	-I..\..\..\jdk\include \
-	-I..\..\..\jdk\include\win32
+	-I$(JAVAHOME)\include \
+	-I$(JAVAHOME)\include\win32
 
 MAKE_OBJ_TYPE = DLL
 DLLNAME = javadom
@@ -50,9 +50,8 @@ LCFLAGS = \
  $(NULL)
 
 LLIBS=	\
-	..\..\..\jdk\lib\jvm.lib \
+	$(JAVAHOME)\lib\jvm.lib \
 	$(DIST)\lib\xpcom.lib \
-	$(DIST)\lib\raptorgfxwin.lib \
 	$(DIST)\lib\img32$(VERSION_NUMBER).lib \
 	$(DIST)\lib\util.lib \
 	$(DIST)\lib\plc3.lib \

mozilla/java/dom/nsJavaDOMImpl.cpp

@@ -640,7 +640,7 @@ static char* strip_whitespace(const PRUnichar* input, int length)
     if ((pc == ' ' || pc == '\n' || pc == '\t') &&
 	(c == ' ' || c == '\n' || c == '\t'))
       continue;
-    *op++ = c;
+    *op++ = (char)c;
     pc = c;
   }
   *op++ = 0;