<Swing Dev> <AWT Dev> RFR: 8081231: JDK9 client build broken on Windows

[Alexander Zvegintsev]

Oh, I see :)
+1

--
Thanks,
Alexander.

On 26.05.2015 23:41, Phil Race wrote:
> Actually no it wasn't :-)  I'd overlooked the line escapes.
>
> So I'll try the following approach :- (but I am waiting for my build 
> to complete) :-
> diff --git 
> a/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp 
> b/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
> --- a/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
> +++ b/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
> @@ -64,6 +64,9 @@
>
>  //#include <sun_awt_shell_Win32ShellFolder2.h>
>
> +#ifndef DASSERT
> +#define DASSERT(x)
> +#endif
>  #define DEFINE_FIELD_ID(var, cls, field, 
> type)                            \
>      jfieldID var = env->GetFieldID(cls, field, 
> type);                     \
>      DASSERT(var != 
> NULL);                                                 \
>
> -phil.
>
> On 05/26/2015 12:14 PM, Alexander Zvegintsev wrote:
>> Looks fine
>>
>> -- 
>> Thanks,
>> Alexander.
>>
>> On 26.05.2015 21:48, Phil Race wrote:
>>> https://bugs.openjdk.java.net/browse/JDK-8081231
>>>
>>>
>>> ShellFolder2 only gets a definition of DASSERT if DEBUG is defined.
>>>
>>> Proposed fix :-
>>>
>>> diff --git 
>>> a/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp 
>>> b/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
>>> --- a/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
>>> +++ b/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
>>> @@ -66,7 +66,9 @@
>>>
>>>  #define DEFINE_FIELD_ID(var, cls, field, type) \
>>>      jfieldID var = env->GetFieldID(cls, field, type); \
>>> +#ifdef DEBUG
>>>      DASSERT(var != NULL); \
>>> +#endif
>>>      CHECK_NULL_RETURN(var, NULL);
>>>
>>> -phil.
>>
>