Re: Patch: jcf-io.c and Win32 case-insensitive filename handling(updated)

[Ranjit Mathew <rmathew at hotmail dot com>]

Mohan,

    IMO, the following (commented out) debug message
should be removed from win32-host.c (jcf_open_exact_case):

[...]
      /* Reject this because it is not a perfect-case match. */
      /* printf("************\nRejected:\n%s\n%s\n************\n\n", filename, fd.cFileName); */
[...]

Ranjit.

Mohan Embar wrote:
> Hi Andrew (and Everyone),
> 
> 
>>>This didn't seem to get applied correctly in 3.4. java/win32-host.o
>>>isn't showing up in Make-lang.in for JAVA_OBJS, GCJH_OBJS and
>>>JCFDUMP_OBJS. It is showing up as a target, though.
>>
>>This is always a risk when someone has to apply a third party patch.
>>Please submit a patch that corrects this.
> 
> 
> This patch corrects the missing java/win32-host.o in 3,4 and fixes a
> breakage in win32-host.c.
> 
> -- Mohan
> http://www.thisiscool.com/
> http://www.animalsong.org/
> 
> ChangeLog
> 2003-06-29  Mohan Embar  <gnustuff@thisiscool.com>
> 
> 	* Make-lang.in: Added missing win32-host.o to JAVA_OBJS,
> 	GCJH_OBJS, JCFDUMP_OBJS
> 	* win32-host.c: Removed the unnecessary and broken dependency
> 	on jcf.h
> 
> Index: Make-lang.in
> ===================================================================
> RCS file: /cvsroot/gcc/gcc/gcc/java/Make-lang.in,v
> retrieving revision 1.114
> diff -u -2 -r1.114 Make-lang.in
> --- Make-lang.in	14 Jun 2003 12:26:36 -0000	1.114
> +++ Make-lang.in	26 Jun 2003 05:33:57 -0000
> @@ -108,5 +108,5 @@
>  JAVA_OBJS = java/parse.o java/class.o java/decl.o java/expr.o \
>    java/constants.o java/lang.o java/typeck.o java/except.o java/verify.o \
> -  java/zextract.o java/jcf-io.o java/jcf-parse.o java/mangle.o \
> +  java/zextract.o java/jcf-io.o java/win32-host.o java/jcf-parse.o java/mangle.o \
>    java/mangle_name.o java/builtins.o java/resource.o \
>    java/jcf-write.o java/buffer.o java/check-init.o java/jcf-depend.o \
> @@ -114,10 +114,10 @@
>  
>  GCJH_OBJS = java/gjavah.o java/jcf-io.o java/jcf-depend.o java/jcf-path.o \
> -  java/zextract.o version.o mkdeps.o errors.o ggc-none.o
> +  java/win32-host.o java/zextract.o version.o mkdeps.o errors.o ggc-none.o
>  
>  JVSCAN_OBJS = java/parse-scan.o java/jv-scan.o version.o
>  
>  JCFDUMP_OBJS = java/jcf-dump.o java/jcf-io.o java/jcf-depend.o java/jcf-path.o \
> -		java/zextract.o errors.o version.o mkdeps.o ggc-none.o
> +		java/win32-host.o java/zextract.o errors.o version.o mkdeps.o ggc-none.o
>  
>  JVGENMAIN_OBJS = java/jvgenmain.o java/mangle_name.o errors.o
> Index: win32-host.c
> ===================================================================
> RCS file: /cvsroot/gcc/gcc/gcc/java/win32-host.c,v
> retrieving revision 1.3
> diff -u -2 -r1.3 win32-host.c
> --- win32-host.c	23 May 2003 18:18:49 -0000	1.3
> +++ win32-host.c	26 Jun 2003 05:33:57 -0000
> @@ -30,6 +30,4 @@
>  #include "system.h"
>  
> -#include "jcf.h"
> -
>  #define WIN32_LEAN_AND_MEAN
>  #include <windows.h>
> 
> 
> 
> 
> 


-- 
Ranjit Mathew          Email: rmathew AT hotmail DOT com

Bangalore, INDIA.      Web: http://ranjitmathew.tripod.com/