gitgitgadget / git

GitGitGadget's Git fork. Open Pull Requests here to submit them to the Git mailing list
https://gitgitgadget.github.io/
Other
213 stars 134 forks source link

mingw: drop bogus (and unneeded) declaration of `_pgmptr` #1752

Closed dscho closed 3 months ago

dscho commented 4 months ago

Ran into this in https://github.com/git-for-windows/git-sdk-64/actions/runs/9558244721/job/26346637793.

cc: Mike Hommey mh@glandium.org

dscho commented 4 months ago

/submit

gitgitgadget[bot] commented 4 months ago

Submitted as pull.1752.git.1718777398765.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-1752/dscho/drop-bogus-_pgmptr-declaration-v1

To fetch this version to local tag pr-1752/dscho/drop-bogus-_pgmptr-declaration-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-1752/dscho/drop-bogus-_pgmptr-declaration-v1
gitgitgadget[bot] commented 4 months ago

On the Git mailing list, Mike Hommey wrote (reply to this):

On Wed, Jun 19, 2024 at 06:09:58AM +0000, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
> 
> In 08809c09aa13 (mingw: add a helper function to attach GDB to the
> current process, 2020-02-13), I added a declaration that was not needed.
> Back then, that did not matter, but now that the declaration of that
> symbol was changed in mingw-w64's headers, it causes the following
> compile error:
> 
>       CC compat/mingw.o
>   compat/mingw.c: In function 'open_in_gdb':
>   compat/mingw.c:35:9: error: function declaration isn't a prototype [-Werror=strict-prototypes]
>      35 |         extern char *_pgmptr;
>         |         ^~~~~~
>   In file included from C:/git-sdk-64/usr/src/git/build-installers/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/mm_malloc.h:27,
>                    from C:/git-sdk-64/usr/src/git/build-installers/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/xmmintrin.h:34,
>                    from C:/git-sdk-64/usr/src/git/build-installers/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/immintrin.h:31,
>                    from C:/git-sdk-64/usr/src/git/build-installers/mingw64/lib/gcc/x86_64-w64-mingw32/14.1.0/include/x86intrin.h:32,
>                    from C:/git-sdk-64/usr/src/git/build-installers/mingw64/include/winnt.h:1658,
>                    from C:/git-sdk-64/usr/src/git/build-installers/mingw64/include/minwindef.h:163,
>                    from C:/git-sdk-64/usr/src/git/build-installers/mingw64/include/windef.h:9,
>                    from C:/git-sdk-64/usr/src/git/build-installers/mingw64/include/windows.h:69,
>                    from C:/git-sdk-64/usr/src/git/build-installers/mingw64/include/winsock2.h:23,
>                    from compat/../git-compat-util.h:215,
>                    from compat/mingw.c:1:
>   compat/mingw.c:35:22: error: '__p__pgmptr' redeclared without dllimport attribute: previous dllimport ignored [-Werror=attributes]
>      35 |         extern char *_pgmptr;
>         |                      ^~~~~~~
> 
> Let's just drop the declaration and get rid of this compile error.

I can only suppose it gets rid of the compiler error with close to 100%
certainty because for some reason, it only happens intermittently for me
and I don't know whether I'm lucky or if the issue is fixed for real,
but what it absolutely sure is that it doesn't break anything.

Mike
gitgitgadget[bot] commented 4 months ago

User Mike Hommey <mh@glandium.org> has been added to the cc: list.

gitgitgadget[bot] commented 4 months ago

On the Git mailing list, Junio C Hamano wrote (reply to this):

Mike Hommey <mh@glandium.org> writes:

> I can only suppose it gets rid of the compiler error with close to 100%
> certainty because for some reason, it only happens intermittently for me
> and I don't know whether I'm lucky or if the issue is fixed for real,
> but what it absolutely sure is that it doesn't break anything.

That is a curious vote of confidence ;-)  Will queue.  Thanks, both.
gitgitgadget[bot] commented 4 months ago

This branch is now known as js/mingw-remove-unused-extern-decl.

gitgitgadget[bot] commented 4 months ago

This patch series was integrated into seen via https://github.com/git/git/commit/06ec1e8bcf92fa990fe58bfd2c152cd009e3bc41.

gitgitgadget[bot] commented 4 months ago

This patch series was integrated into next via https://github.com/git/git/commit/65b323930f6efc70da0a3413ff6c57734ce2f818.

gitgitgadget[bot] commented 4 months ago

There was a status update in the "New Topics" section about the branch js/mingw-remove-unused-extern-decl on the Git mailing list:

An unused extern declaration for mingw has been removed to prevent
it from causing build failure.

Will merge to 'master'.
source: <pull.1752.git.1718777398765.gitgitgadget@gmail.com>
gitgitgadget[bot] commented 4 months ago

This patch series was integrated into seen via https://github.com/git/git/commit/5257207f7b9d03c93d4e5e9051bdef6adbccb842.

gitgitgadget[bot] commented 4 months ago

This patch series was integrated into seen via https://github.com/git/git/commit/b62c197e3d2d73209f12198b35d9e9af5890df4b.

gitgitgadget[bot] commented 4 months ago

There was a status update in the "Cooking" section about the branch js/mingw-remove-unused-extern-decl on the Git mailing list:

An unused extern declaration for mingw has been removed to prevent
it from causing build failure.

Will merge to 'master'.
source: <pull.1752.git.1718777398765.gitgitgadget@gmail.com>
gitgitgadget[bot] commented 3 months ago

This patch series was integrated into seen via https://github.com/git/git/commit/553af1f24cc721697f55cbdf2af655975fe9d713.

gitgitgadget[bot] commented 3 months ago

This patch series was integrated into seen via https://github.com/git/git/commit/0b0307e27b8352ad9a820daac2543425912ce641.

gitgitgadget[bot] commented 3 months ago

This patch series was integrated into seen via https://github.com/git/git/commit/55b59b69f121019f7cfcabd48853db40a4d0713a.

gitgitgadget[bot] commented 3 months ago

This patch series was integrated into seen via https://github.com/git/git/commit/424a13db64545b5c9d1a91bceda4388bebc78865.

gitgitgadget[bot] commented 3 months ago

This patch series was integrated into master via https://github.com/git/git/commit/424a13db64545b5c9d1a91bceda4388bebc78865.

gitgitgadget[bot] commented 3 months ago

This patch series was integrated into next via https://github.com/git/git/commit/424a13db64545b5c9d1a91bceda4388bebc78865.

gitgitgadget[bot] commented 3 months ago

Closed via 424a13db64545b5c9d1a91bceda4388bebc78865.