[LIBJPEG]
[reactos.git] / reactos / sdk / include / reactos / libs / libjpeg / rosdiff.patch
1 Index: include/reactos/libs/libjpeg/jmorecfg.h
2 ===================================================================
3 --- include/reactos/libs/libjpeg/jmorecfg.h (revision 66390)
4 +++ include/reactos/libs/libjpeg/jmorecfg.h (working copy)
5 @@ -238,14 +238,62 @@
6 * or code profilers that require it.
7 */
8
9 +#ifdef _WIN32
10 +# if defined(ALL_STATIC)
11 +# if defined(JPEG_DLL)
12 +# undef JPEG_DLL
13 +# endif
14 +# if !defined(JPEG_STATIC)
15 +# define JPEG_STATIC
16 +# endif
17 +# endif
18 +# if defined(JPEG_DLL)
19 +# if defined(JPEG_STATIC)
20 +# undef JPEG_STATIC
21 +# endif
22 +# endif
23 +# if defined(JPEG_DLL)
24 +/* building a DLL */
25 +# define JPEG_IMPEXP __declspec(dllexport)
26 +# elif defined(JPEG_STATIC)
27 +/* building or linking to a static library */
28 +# define JPEG_IMPEXP
29 +# else
30 +/* linking to the DLL */
31 +# define JPEG_IMPEXP __declspec(dllimport)
32 +# endif
33 +# if !defined(JPEG_API)
34 +# define JPEG_API __cdecl
35 +# endif
36 +/* The only remaining magic that is necessary for cygwin */
37 +#elif defined(__CYGWIN__)
38 +# if !defined(JPEG_IMPEXP)
39 +# define JPEG_IMPEXP
40 +# endif
41 +# if !defined(JPEG_API)
42 +# define JPEG_API __cdecl
43 +# endif
44 +#endif
45 +
46 +/* Ensure our magic doesn't hurt other platforms */
47 +#if !defined(JPEG_IMPEXP)
48 +# define JPEG_IMPEXP
49 +#endif
50 +#if !defined(JPEG_API)
51 +# define JPEG_API
52 +#endif
53 +
54 /* a function called through method pointers: */
55 #define METHODDEF(type) static type
56 /* a function used only in its module: */
57 #define LOCAL(type) static type
58 /* a function referenced thru EXTERNs: */
59 -#define GLOBAL(type) type
60 +#define GLOBAL(type) type JPEG_API
61 /* a reference to a GLOBAL function: */
62 -#define EXTERN(type) extern type
63 +#ifndef EXTERN
64 +# define EXTERN(type) extern JPEG_IMPEXP type JPEG_API
65 +/* a reference to a "GLOBAL" function exported by sourcefiles of utility progs */
66 +#endif /* EXTERN */
67
68
69 /* This macro is used to declare a "method", that is, a function pointer.