|
19 | 19 |
|
20 | 20 | #define PNG_1_2_X |
21 | 21 |
|
22 | | -/* |
| 22 | +/* |
23 | 23 | * PNG_USER_CONFIG has to be defined on the compiler command line. This |
24 | 24 | * includes the resource compiler for Windows DLL configurations. |
25 | 25 | */ |
|
39 | 39 |
|
40 | 40 | /* |
41 | 41 | * Added at libpng-1.2.8 |
42 | | - * |
| 42 | + * |
43 | 43 | * If you create a private DLL you need to define in "pngusr.h" the followings: |
44 | 44 | * #define PNG_USER_PRIVATEBUILD <Describes by whom and why this version of |
45 | 45 | * the DLL was built> |
|
50 | 50 | * number and must match your private DLL name> |
51 | 51 | * e.g. // private DLL "libpng13gx.dll" |
52 | 52 | * #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 |
55 | 55 | * DLL VERSIONINFO structure. |
56 | 56 | * - PNG_USER_VERSIONINFO_COMMENTS |
57 | 57 | * - PNG_USER_VERSIONINFO_COMPANYNAME |
|
147 | 147 | * 'Cygwin' defines/defaults: |
148 | 148 | * PNG_BUILD_DLL -- (ignored) building the dll |
149 | 149 | * (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 |
151 | 151 | * 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 |
153 | 153 | * application that links to the static libs. |
154 | 154 | * Thus, |
155 | 155 | * a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and |
|
162 | 162 | * PNG_BUILD_DLL |
163 | 163 | * PNG_STATIC |
164 | 164 | * (nothing) == PNG_USE_DLL |
165 | | - * |
| 165 | + * |
166 | 166 | * 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 |
168 | 168 | * __declspec(dllexport) / __declspec(dllimport) and friends. Therefore, |
169 | 169 | * 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 |
171 | 171 | * PNG_BUILD_DLL and PNG_STATIC because those change some defaults |
172 | 172 | * such as CONSOLE_IO and whether GLOBAL_ARRAYS are allowed. |
173 | 173 | */ |
|
211 | 211 | # if !defined(PNG_DLL) |
212 | 212 | # define PNG_DLL |
213 | 213 | # endif |
214 | | -# endif |
215 | | -# endif |
| 214 | +# endif |
| 215 | +# endif |
216 | 216 | # endif |
217 | 217 | #endif |
218 | 218 |
|
|
368 | 368 | */ |
369 | 369 |
|
370 | 370 | #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> |
382 | 372 | # if defined(_AMIGA) && defined(__SASC) && defined(_M68881) |
383 | 373 | /* Amiga SAS/C: We must include builtin FPU functions when compiling using |
384 | 374 | * MATH=68881 |
|
733 | 723 | # define PNG_EASY_ACCESS_SUPPORTED |
734 | 724 | #endif |
735 | 725 |
|
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 |
737 | 727 | * and removed from version 1.2.20. The following will be removed |
738 | 728 | * from libpng-1.4.0 |
739 | 729 | */ |
@@ -1314,7 +1304,7 @@ typedef z_stream FAR * png_zstreamp; |
1314 | 1304 | # define PNGAPI __cdecl |
1315 | 1305 | # undef PNG_IMPEXP |
1316 | 1306 | # define PNG_IMPEXP |
1317 | | -#endif |
| 1307 | +#endif |
1318 | 1308 |
|
1319 | 1309 | /* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall", |
1320 | 1310 | * you may get warnings regarding the linkage of png_zalloc and png_zfree. |
|
0 commit comments