[prev in list] [next in list] [prev in thread] [next in thread] 

List:       graphicsmagick-commit
Subject:    [GM-commit] GraphicsMagick: Reverted file "jmorecfg.h" to previous version. ...
From:       GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date:       2022-08-07 9:48:51
Message-ID: mailman.21458.1659865739.1524.graphicsmagick-commit () lists ! sourceforge ! net
[Download RAW message or body]

changeset 9c564d99b50a in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=9c564d99b50a
summary: Reverted file "jmorecfg.h" to previous version. It contains specially tailored chunk for gm.

diffstat:

 jpeg/jmorecfg.h |  43 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 deletions(-)

diffs (53 lines):

diff -r d4343d154600 -r 9c564d99b50a jpeg/jmorecfg.h
--- a/jpeg/jmorecfg.h	Sun Aug 07 10:41:52 2022 +0200
+++ b/jpeg/jmorecfg.h	Sun Aug 07 11:48:19 2022 +0200
@@ -247,6 +247,49 @@
 /* a reference to a GLOBAL function: */
 #define EXTERN(type)		extern type
 
+/*
+ * Following chunk added for GraphicsMagick
+ */
+#if defined(_VISUALC_)
+#  undef GLOBAL
+#  undef EXTERN
+   //
+   // Under VISUALC we have single threaded static libraries, or
+   // mutli-threaded DLLs using the multithreaded runtime DLLs.
+   //
+#  if defined(_MT) && defined(_DLL) && !defined(_JPEGDLL_) && !defined(_LIB)
+#    define _JPEGDLL_
+#  endif
+#  if defined(_JPEGDLL_)
+#    pragma warning( disable: 4273 )	/* Disable the stupid dll linkage warnings */
+#    if !defined(_JPEGLIB_)
+       // a function referenced thru EXTERNs:
+#      define GLOBAL(type) __declspec(dllimport) type
+       // a reference to a GLOBAL function:
+#      define EXTERN(type) extern __declspec(dllimport) type
+#    else
+       // a function referenced thru EXTERNs:
+#      define GLOBAL(type) __declspec(dllexport) type
+       // a reference to a GLOBAL function:
+#      define EXTERN(type) extern __declspec(dllexport) type
+#    endif
+#  else
+     // a function referenced thru EXTERNs:
+#    define GLOBAL(type) type
+     // a reference to a GLOBAL function:
+#    define EXTERN(type) extern type
+#  endif
+
+#  pragma warning(disable : 4018)
+#  pragma warning(disable : 4244)
+#  pragma warning(disable : 4142)
+
+#  ifndef INLINE
+#    define INLINE __inline  /* MSVC uses __inline */
+#  endif
+
+#endif /* defined(_VISUALC_) */
+
 
 /* This macro is used to declare a "method", that is, a function pointer.
  * We want to supply prototype parameters if the compiler can cope.


_______________________________________________
Graphicsmagick-commit mailing list
Graphicsmagick-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit
[prev in list] [next in list] [prev in thread] [next in thread]