Skip to content

Commit 3d56dbb

Browse files
committed
fix: macos fp.h deprecation
1 parent e49f9d0 commit 3d56dbb

1 file changed

Lines changed: 14 additions & 24 deletions

File tree

src/libs/src/png/pngconf.h

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#define PNG_1_2_X
2121

22-
/*
22+
/*
2323
* PNG_USER_CONFIG has to be defined on the compiler command line. This
2424
* includes the resource compiler for Windows DLL configurations.
2525
*/
@@ -39,7 +39,7 @@
3939

4040
/*
4141
* Added at libpng-1.2.8
42-
*
42+
*
4343
* If you create a private DLL you need to define in "pngusr.h" the followings:
4444
* #define PNG_USER_PRIVATEBUILD <Describes by whom and why this version of
4545
* the DLL was built>
@@ -50,8 +50,8 @@
5050
* number and must match your private DLL name>
5151
* e.g. // private DLL "libpng13gx.dll"
5252
* #define PNG_USER_DLLFNAME_POSTFIX "gx"
53-
*
54-
* The following macros are also at your disposal if you want to complete the
53+
*
54+
* The following macros are also at your disposal if you want to complete the
5555
* DLL VERSIONINFO structure.
5656
* - PNG_USER_VERSIONINFO_COMMENTS
5757
* - PNG_USER_VERSIONINFO_COMPANYNAME
@@ -147,9 +147,9 @@
147147
* 'Cygwin' defines/defaults:
148148
* PNG_BUILD_DLL -- (ignored) building the dll
149149
* (no define) -- (ignored) building an application, linking to the dll
150-
* PNG_STATIC -- (ignored) building the static lib, or building an
150+
* PNG_STATIC -- (ignored) building the static lib, or building an
151151
* application that links to the static lib.
152-
* ALL_STATIC -- (ignored) building various static libs, or building an
152+
* ALL_STATIC -- (ignored) building various static libs, or building an
153153
* application that links to the static libs.
154154
* Thus,
155155
* a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and
@@ -162,12 +162,12 @@
162162
* PNG_BUILD_DLL
163163
* PNG_STATIC
164164
* (nothing) == PNG_USE_DLL
165-
*
165+
*
166166
* CYGWIN (2002-01-20): The preceding is now obsolete. With the advent
167-
* of auto-import in binutils, we no longer need to worry about
167+
* of auto-import in binutils, we no longer need to worry about
168168
* __declspec(dllexport) / __declspec(dllimport) and friends. Therefore,
169169
* we don't need to worry about PNG_STATIC or ALL_STATIC when it comes
170-
* to __declspec() stuff. However, we DO need to worry about
170+
* to __declspec() stuff. However, we DO need to worry about
171171
* PNG_BUILD_DLL and PNG_STATIC because those change some defaults
172172
* such as CONSOLE_IO and whether GLOBAL_ARRAYS are allowed.
173173
*/
@@ -211,8 +211,8 @@
211211
# if !defined(PNG_DLL)
212212
# define PNG_DLL
213213
# endif
214-
# endif
215-
# endif
214+
# endif
215+
# endif
216216
# endif
217217
#endif
218218

@@ -368,17 +368,7 @@
368368
*/
369369

370370
#if defined(PNG_FLOATING_POINT_SUPPORTED)
371-
# if defined(MACOS)
372-
/* We need to check that <math.h> hasn't already been included earlier
373-
* as it seems it doesn't agree with <fp.h>, yet we should really use
374-
* <fp.h> if possible.
375-
*/
376-
# if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
377-
# include <fp.h>
378-
# endif
379-
# else
380-
# include <math.h>
381-
# endif
371+
# include <math.h>
382372
# if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
383373
/* Amiga SAS/C: We must include builtin FPU functions when compiling using
384374
* MATH=68881
@@ -733,7 +723,7 @@
733723
# define PNG_EASY_ACCESS_SUPPORTED
734724
#endif
735725

736-
/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0
726+
/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0
737727
* and removed from version 1.2.20. The following will be removed
738728
* from libpng-1.4.0
739729
*/
@@ -1314,7 +1304,7 @@ typedef z_stream FAR * png_zstreamp;
13141304
# define PNGAPI __cdecl
13151305
# undef PNG_IMPEXP
13161306
# define PNG_IMPEXP
1317-
#endif
1307+
#endif
13181308

13191309
/* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall",
13201310
* you may get warnings regarding the linkage of png_zalloc and png_zfree.

0 commit comments

Comments
 (0)