40300 - remove duplicate ifdefs for XP_OS2_VACPP in jni_md.h

Status: VERIFIED FIXED

(Core Graveyard :: Java: OJI, defect, P3)

Description

[snizinsk]

See diff below. There is a redundant ifdef for XP_OS2_VACPP which must be 
removed for the OS/2 VisualAge compiler which needs JNICALL defines as _Optlink. 
The first ifdef correctly defines JNICALL, while the 2nd (redundant) ifdef does 
not. 

> Index: jni_md.h
> ===================================================================
> RCS file: /cvsroot/mozilla/sun-java/stubs/include/jni_md.h,v
> retrieving revision 3.5
> diff -u -r3.5 jni_md.h
> --- jni_md.h   2000/04/06 04:21:51 3.5
> +++ jni_md.h   2000/05/09 22:03:00
> @@ -81,24 +81,13 @@
>  /* DLL Entry modifiers... */
>  #if defined(XP_OS2)
>  #  ifdef XP_OS2_VACPP
> -#    define JNI_PUBLIC_API(ResultType)          ResultType _System
> -#    define JNI_PUBLIC_VAR(VarType)        VarType
> +#     define JNI_PUBLIC_API(ResultType)          ResultType _System
> +#     define JNI_PUBLIC_VAR(VarType)        VarType
>  #     define JNICALL                        _Optlink
>  #     define JNIEXPORT
>  #  else
> -#    define JNI_PUBLIC_API(ResultType)          ResultType
> -#    define JNI_PUBLIC_VAR(VarType)        VarType
> -#     define JNICALL
> -#     define JNIEXPORT
> -#  endif
> -#  ifdef XP_OS2_VACPP
> -#     define JNI_PUBLIC_API(ResultType)          ResultType _System
> -#     define JNI_PUBLIC_VAR(VarType)        VarType
> -#     define JNICALL
> -#     define JNIEXPORT
> -#  else
> -#     define JNI_PUBLIC_API(ResultType)          ResultType
> -#     define JNI_PUBLIC_VAR(VarType)        VarType
> +#     define JNI_PUBLIC_API(ResultType)          ResultType
> +#     define JNI_PUBLIC_VAR(VarType)        VarType
>  #     define JNICALL
>  #     define JNIEXPORT
>  #  endif
>

Comment 1

[drapeau]

Okay, so I think the big problem is that jni.h should not be part of the mozilla 
tree in the first place (and therefore, jni_md.h), but since it's there right 
now and there's a need to get this fixed here just to make the build work, I say 
go for it, use "r=[e-mail], a=[e-mail]" and check in the 
fix.

I've also changed the Severity of this bug to "blocker", since it sounds like 
you can't even *build* the lizard without this being fixed.

Also assigning this bug to [e-mail].

Comment 2

[snizinsk]

Checked in the change.

Comment 3

[shrirang khanzode]

verified that the dup ifdef has been removed from the jni_md.h file.