view src/msvc-tiff-1.patch @ 4543:7d1e45c2f175

update: more PKG_UPDATE updates, added update-octaveforge target * src/libxml++.mk, src/libxml2.mk, src/libxshmfence.mk, src/libxslt.mk, src/llvm.mk, src/mingwrt.mk, src/msys-libcrypt.mk, src/msys-libopenssl.mk, src/muparser.mk, rc/nsis.mk: update PKG_UPDATE rule * src/of-actuarial.mk, src/of-communications.mk, src/of-control.mk, src/of-data-smoothing.mk, src/of-database.mk, src/of-dataframe.mk, src/of-dicom.mk, src/of-financial.mk, src/of-fits.mk, src/of-fl-core.mk, src/of-fuzzy-logic-toolkit.mk, src/of-ga.mk, src/of-ga.mk, src/of-general.mk, src/of-generate_html.mk, src/of-geometry.mk, src/of-gsl.mk, src/of-image.mk, src/of-instrument-control.mk, src/of-interval.mk, src/of-io.mk, src/of-linear-algebra.mk, src/of-lssa.mk, src/of-ltfat.mk, src/of-mapping.mk, src/of-miscellaneous.mk, src/of-nan.mk, src/of-netcdf.mk, src/of-nurbs.mk, src/of-ocs.mk, src/of-octcdf.mk, src/of-odepkg.mk, src/of-optim.mk, src/of-quaternion.mk, src/of-signal.mk, src/of-sockets.mk, src/of-sparsersb.mk, src/of-specfun.mk, src/of-splines.mk, src/of-statistics.mk, src/of-stk.mk, src/of-strings.mk, src/of-struct.mk, src/of-tisean.mk, src/of-tsa.mk, src/of-video.mk, src/of-windows.mk, src/of-zeromq.mk, src/of-queueing.mk, : use $(OCTAVE_FORGE_PKG_UPDATE) * Makefile.in: added OCTAVE_FORGE_PKG_UPDATE macro, added update-octaveforge target
author John D
date Wed, 22 Nov 2017 15:26:02 -0500
parents 14afb4dd1939
children
line wrap: on
line source

diff -ur tiff-4.0.3-orig/libtiff/Makefile.in tiff-4.0.3/libtiff/Makefile.in
--- tiff-4.0.3-orig/libtiff/Makefile.in	2012-09-22 12:08:19 -0400
+++ tiff-4.0.3/libtiff/Makefile.in	2013-06-26 22:40:20 -0400
@@ -423,10 +423,12 @@
 
 lib_LTLIBRARIES = libtiff.la $(am__append_6)
 libtiff_la_LDFLAGS = -no-undefined -version-info \
-	$(LIBTIFF_VERSION_INFO) $(am__append_7) $(am__append_8)
+	$(LIBTIFF_VERSION_INFO) $(am__append_7) $(am__append_8) \
+	-export-symbols-regex "xXx" -Wl,libtiff.def
 libtiff_la_LIBADD = $(LIBPORT)
 libtiffxx_la_LDFLAGS = -no-undefined -version-info \
-	$(LIBTIFF_VERSION_INFO) $(am__append_9) $(am__append_10)
+	$(LIBTIFF_VERSION_INFO) $(am__append_9) $(am__append_10) \
+	-export-symbols-regex "xXx"
 libtiffxx_la_LIBADD = $(LIBTIFF) $(LIBPORT)
 libtiffxx_la_DEPENDENCIES = libtiff.la
 mkg3states_SOURCES = mkg3states.c tif_fax3.h
diff -ur tiff-4.0.3-orig/libtiff/tif_stream.cxx tiff-4.0.3/libtiff/tif_stream.cxx
--- tiff-4.0.3-orig/libtiff/tif_stream.cxx	2010-12-13 20:45:44 -0500
+++ tiff-4.0.3/libtiff/tif_stream.cxx	2013-06-26 22:31:55 -0400
@@ -392,6 +392,9 @@
 
 } /* extern "C" */
 
+#ifdef _MSC_VER
+__declspec(dllexport)
+#endif
 TIFF*
 TIFFStreamOpen(const char* name, ostream *os)
 {
@@ -408,6 +411,9 @@
 	return _tiffStreamOpen(name, "wm", os);
 }
 
+#ifdef _MSC_VER
+__declspec(dllexport)
+#endif
 TIFF*
 TIFFStreamOpen(const char* name, istream *is)
 {
diff -ur tiff-4.0.3-orig/libtiff/tiffiop.h tiff-4.0.3/libtiff/tiffiop.h
--- tiff-4.0.3-orig/libtiff/tiffiop.h	2012-06-06 09:35:23 -0400
+++ tiff-4.0.3/libtiff/tiffiop.h	2013-06-26 22:35:20 -0400
@@ -72,6 +72,10 @@
 #define	FALSE	0
 #endif
 
+#if defined(_MSC_VER) && !defined(snprintf)
+#define snprintf _snprintf
+#endif
+
 typedef struct client_info {
     struct client_info *next;
     void *data;