Skip to content

Ensure mergesort is declared if needed#7411

Merged
PaulWessel merged 1 commit intomasterfrom
mergesort-fix
Apr 24, 2023
Merged

Ensure mergesort is declared if needed#7411
PaulWessel merged 1 commit intomasterfrom
mergesort-fix

Conversation

@PaulWessel
Copy link
Member

See #7410 for background. Here I implement it a bit differently. The mergesort function is used both in a module (gmtspatial) as well as by some gmt_*.c libraries, hence if it is not part of the standard Linux libraries we declare it in gmt_prototypes.h and include mergesoft.c in gmt_init.c so it is declared and available for both modules and libs.

Hoping @fweimer-rh can test this branch instead.

See #7410  for background.  Here I implement it a bit differently.  The mergesort function is used both in a module (gmtspatial) as well as by some gmt_*.c libraries, hence if it is not part of the standard libraries we declare it in gmt_prototypes.h so it is set for both modules and libs.
@PaulWessel PaulWessel added the maintenance Boring but important stuff for the core devs label Apr 24, 2023
@PaulWessel PaulWessel added this to the 6.5.0 milestone Apr 24, 2023
@PaulWessel PaulWessel requested a review from joa-quim April 24, 2023 12:46
@PaulWessel PaulWessel self-assigned this Apr 24, 2023
@fweimer-rh
Copy link

Hoping @fweimer-rh can test this branch instead.

@PaulWessel I backported your patch into Fedora's version instead, and it passes the C99 compatibility checks. Thanks.

@PaulWessel PaulWessel merged commit 4219875 into master Apr 24, 2023
@PaulWessel PaulWessel deleted the mergesort-fix branch April 24, 2023 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

maintenance Boring but important stuff for the core devs

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants