Skip to content

Commit cecf2ff

Browse files
committed
vendor: Update vendored sources to igraph/igraph@5216243
refactor: cleaner workaround in plfit for Windows 11 SDK bug where NAN is defined in a non-constant manner
1 parent c235c02 commit cecf2ff

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/vendor/cigraph/vendor/plfit/hzeta.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,23 @@
4646
#define _USE_MATH_DEFINES
4747
#endif
4848

49-
#include <math.h>
50-
#include <stdio.h>
51-
#include "hzeta.h"
52-
#include "plfit_error.h"
53-
5449
/* Work around bug in some Windows SDK / MSVC versions where NAN is not a
5550
* constant expression, triggering an error in the definition of
5651
* hsl_sf_hzeta_eulermaclaurin_series_coeffs[] and
5752
* hsl_sf_hzeta_eulermaclaurin_series_majorantratios[] below.
5853
* We re-define NAN to the value it had in earlier MSVC versions.
5954
* See https://github.com/igraph/igraph/issues/2701
55+
* and https://developercommunity.visualstudio.com/t/NAN-is-no-longer-compile-time-constant-i/10688907
6056
*/
6157
#ifdef _MSC_VER
62-
#undef NAN
63-
#define NAN (-(float)(((float)(1e+300 * 1e+300)) * 0.0F))
58+
#define _UCRT_NOISY_NAN
6459
#endif
6560

61+
#include <math.h>
62+
#include <stdio.h>
63+
#include "hzeta.h"
64+
#include "plfit_error.h"
65+
6666
/* imported from gsl_machine.h */
6767

6868
#define GSL_LOG_DBL_MIN (-7.0839641853226408e+02)

src/vendor/igraph_version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828

2929
__BEGIN_DECLS
3030

31-
#define IGRAPH_VERSION "0.10.15-46-g622f331dc"
31+
#define IGRAPH_VERSION "0.10.15-47-g521624378"
3232
#define IGRAPH_VERSION_MAJOR 0
3333
#define IGRAPH_VERSION_MINOR 10
3434
#define IGRAPH_VERSION_PATCH 15
35-
#define IGRAPH_VERSION_PRERELEASE "46-g622f331dc"
35+
#define IGRAPH_VERSION_PRERELEASE "47-g521624378"
3636

3737
IGRAPH_EXPORT void igraph_version(const char **version_string,
3838
int *major,

0 commit comments

Comments
 (0)