Skip to content

Commit

Permalink
Merge branch 'release/9.0-rc1' into darc-release/9.0-rc1-90dca1bd-c51…
Browse files Browse the repository at this point in the history
…e-4a75-8a73-619a07d67897
  • Loading branch information
lewing committed Aug 18, 2024
2 parents b578a72 + 01607d3 commit 467cb0d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/native/external/zlib-ng/functable.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/

#if defined(_MSC_VER)
# include <intrin.h>
#endif

#include "zbuild.h"
#include "zendian.h"
#include "crc32_braid_p.h"
Expand All @@ -11,10 +15,6 @@
#include "functable.h"
#include "cpu_features.h"

#if defined(_MSC_VER)
# include <intrin.h>
#endif

/* Platform has pointer size atomic store */
#if defined(__GNUC__) || defined(__clang__)
# define FUNCTABLE_ASSIGN(VAR, FUNC_NAME) \
Expand Down

0 comments on commit 467cb0d

Please sign in to comment.