Windows openj9-staging failing to compile, merge problem about openj9-openjdk-jdk HOT 6 CLOSED

@andrew-m-leonard

from openj9-openjdk-jdk.

b35356d#diff-b5078076fd797817acd3d97d9357ceeb
If I remember correctly @pshipton, this change was a change in openjdk code that was fixing a patch we had in openj9. The line above caused a merge conflict when merged from HEAD to openj9-staging.

from openj9-openjdk-jdk.

Problem is the function declaration is inconsistent with the declaration in src/jdk.jdwp.agent/share/native/libjdwp/export/sys.h

openj9-staging
void dbgsysBuildLibName(char *, size_t, const char *, const char *);

master
void dbgsysBuildLibName(char *, int, const char *, const char *);

from openj9-openjdk-jdk.

As part of the patch 5222689#diff-2b764b7cc320d5bf9704f09377c94f41 the src/jdk.jdwp.agent/share/native/libjdwp/export/sys.h file was edited to compensate for the patch (ie. replacing int to size_t in the above method declaration). In openjdk code, this remained int and when they contributed their change this value was unaffected and therefore was not edited by the auto merge. Clearly me and Andrew missed this when we dealt with the merge conflict, since it was not in conflict itself. So reverting this value back to int as it is in master would effectively remove our patch. Please correct me if I made any mistakes here but this is my understanding of it.

from openj9-openjdk-jdk.

@adam-thorpe sounds good. Please create a PR to fix it, and we'll run some testing to ensure everything still works.

from openj9-openjdk-jdk.

@pshipton can this be closed please?

from openj9-openjdk-jdk.