Changeset 846 for trunk/src/3rdparty/libtiff/port

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/libtiff/port/Makefile.am (deleted)
• src/3rdparty/libtiff/port/Makefile.in (deleted)
• src/3rdparty/libtiff/port/Makefile.vc (deleted)
• src/3rdparty/libtiff/port/dummy.c (modified) (2 diffs)
• src/3rdparty/libtiff/port/lfind.c (modified) (2 diffs)
• src/3rdparty/libtiff/port/libport.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/3rdparty/libtiff/port/libport.h )

trunk/src/3rdparty/libtiff/port/dummy.c

@@ -1 @@
-/* $Id: dummy.c,v 1.2 2005/07/07 15:21:52 dron Exp $ */
+/* $Id: dummy.c,v 1.2.2.1 2007/03/21 14:53:46 dron Exp $ */
 
 /*
@@ -5 +5 @@
  */
 
-static void
+void
 libport_dummy_function()
 {

trunk/src/3rdparty/libtiff/port/lfind.c

@@ -1 @@
-/* $Id: lfind.c,v 1.3 2005/12/27 15:08:22 dron Exp $ */
+/* $Id: lfind.c,v 1.4 2007/01/15 18:40:39 mloskot Exp $ */
 
 /*
@@ -38 +38 @@
 #endif
 
-#include <sys/types.h>
+#ifdef _WIN32_WCE
+# include <wce_types.h>
+#else
+# include <sys/types.h>
+#endif
 
 #ifndef NULL