Fixed zlib build for WEC7.

errno in zutil.c is leftover, and not used anymore -> removed.

In gzguts.h qsvgfunctions_wince.h are included. To use this header
qglobal.h is needed.

qsqvgfunctions_wince.h and .cpp contains implementation for missing
wince functions etc.

Task-number: QTBUG-22507
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>

This change is partially cherry picked from commit:
2fa9c829faae10f445fd580627114a8383b753ab

Change-Id: Ifef46ab829d12600b967cc3aa87fe2b8342b4f77
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

5 files changed, 232 insertions, 10 deletions

diff --git a/src/3rdparty/zlib/gzguts.h b/src/3rdparty/zlib/gzguts.h
index 9f9640b..267770a 100644
--- a/src/3rdparty/zlib/gzguts.h
+++ b/src/3rdparty/zlib/gzguts.h
@@ -36,7 +36,10 @@
 #  include <limits.h>
 #endif
 #if !defined(_WIN32_WCE)
-#include <fcntl.h>
+#  include <fcntl.h>
+#else
+# include <qglobal.h>
+# include <qsvgfunctions_wince.h>
 #endif
 
 #ifdef NO_DEFLATE       /* for compatibility with old definition */
@@ -44,7 +47,9 @@
 #endif
 
 #ifdef _MSC_VER
-#  include <io.h>
+#  if !defined(_WIN32_WCE)
+#    include <io.h>
+#  endif
 #  define vsnprintf _vsnprintf
 #endif
 
diff --git a/src/3rdparty/zlib/zutil.c b/src/3rdparty/zlib/zutil.c
index 898ed34..3418c59 100644
--- a/src/3rdparty/zlib/zutil.c
+++ b/src/3rdparty/zlib/zutil.c
@@ -136,14 +136,6 @@ const char * ZEXPORT zError(err)
     return ERR_MSG(err);
 }
 
-#if defined(_WIN32_WCE)
-    /* The Microsoft C Run-Time Library for Windows CE doesn't have
-     * errno.  We define it as a global variable to simplify porting.
-     * Its value is always 0 and should not be used.
-     */
-    int errno = 0;
-#endif
-
 #ifndef HAVE_MEMCPY
 
 void ZLIB_INTERNAL zmemcpy(dest, source, len)
diff --git a/src/svg/qsvgfunctions_wince.cpp b/src/svg/qsvgfunctions_wince.cpp
new file mode 100644
index 0000000..4df4cd4
--- /dev/null
+++ b/src/svg/qsvgfunctions_wince.cpp
@@ -0,0 +1,132 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtSvg module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifdef _WIN32_WCE //Q_OS_WINCE
+
+#include <windows.h>
+#include <winbase.h>
+#include <kfuncs.h>
+#include <stdio.h>
+#include <altcecrt.h>
+
+#include "qplatformdefs.h"
+#include "qfunctions_wince.h"
+#include "qstring.h"
+#include "qbytearray.h"
+#include "qhash.h"
+
+QT_USE_NAMESPACE
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// File I/O ---------------------------------------------------------
+int errno = 0;
+
+int qt_wince_open(const char *filename, int oflag, int pmode)
+{
+    QString fn(QString::fromLatin1(filename));
+    return _wopen((wchar_t*)fn.utf16(), oflag, pmode);
+}
+
+int qt_wince__wopen(const wchar_t *filename, int oflag, int /*pmode*/)
+{
+    wchar_t *flag;
+
+    if (oflag & _O_APPEND) {
+        if (oflag & _O_WRONLY) {
+            flag = L"a";
+        } else if (oflag & _O_RDWR) {
+            flag = L"a+";
+        }
+    } else if (oflag & _O_BINARY) {
+        if (oflag & _O_WRONLY) {
+            flag = L"wb";
+        } else if (oflag & _O_RDWR) {
+            flag = L"w+b"; // slightly different from "r+" where the file must exist
+        } else if (oflag & _O_RDONLY) {
+            flag = L"rb";
+        } else {
+            flag = L"b";
+        }
+    } else {
+        if (oflag & _O_WRONLY) {
+            flag = L"wt";
+        } else if (oflag & _O_RDWR) {
+            flag = L"w+t"; // slightly different from "r+" where the file must exist
+        } else if (oflag & _O_RDONLY) {
+            flag = L"rt";
+        } else {
+            flag = L"t";
+        }
+    }
+
+    int retval = (int)_wfopen(filename, flag);
+    return (retval == NULL) ? -1 : retval;
+}
+
+long qt_wince__lseek(int handle, long offset, int origin)
+{
+    return fseek((FILE*)handle, offset, origin);
+}
+
+int qt_wince__read(int handle, void *buffer, unsigned int count)
+{
+    return fread(buffer, 1, count, (FILE*)handle);
+}
+
+int qt_wince__write(int handle, const void *buffer, unsigned int count)
+{
+    return fwrite(buffer, 1, count, (FILE*)handle);
+}
+
+int qt_wince__close(int handle)
+{
+    if (!handle)
+        return 0;
+    return fclose((FILE*)handle);
+}
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // Q_OS_WINCE
diff --git a/src/svg/qsvgfunctions_wince.h b/src/svg/qsvgfunctions_wince.h
new file mode 100644
index 0000000..bdc5da3
--- /dev/null
+++ b/src/svg/qsvgfunctions_wince.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtSvg module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QSVGFUNCTIONS_WCE_H
+#define QSVGFUNCTIONS_WCE_H
+
+#ifdef Q_OS_WINCE
+
+// File I/O ---------------------------------------------------------
+
+#define _O_RDONLY       0x0001
+#define _O_RDWR         0x0002
+#define _O_WRONLY       0x0004
+#define _O_CREAT        0x0008
+#define _O_TRUNC        0x0010
+#define _O_APPEND       0x0020
+#define _O_EXCL         0x0040
+
+#define O_RDONLY        _O_RDONLY
+#define O_RDWR          _O_RDWR
+#define O_WRONLY        _O_WRONLY
+#define O_CREAT         _O_CREAT
+#define O_TRUNC         _O_TRUNC
+#define O_APPEND        _O_APPEND
+#define O_EXCL          _O_EXCL
+
+//For zlib we need these helper functions, but they break the build when
+//set globally, so just set them for zlib use
+#ifdef ZLIB_H
+#define open qt_wince_open
+#define _wopen(a,b,c) qt_wince__wopen(a,b,c)
+#define close qt_wince__close
+#define lseek qt_wince__lseek
+#define read qt_wince__read
+#define write qt_wince__write
+#endif
+
+int qt_wince__wopen(const wchar_t *filename, int oflag, int pmode);
+int qt_wince_open(const char *filename, int oflag, int pmode);
+int qt_wince__close(int handle);
+long qt_wince__lseek(int handle, long offset, int origin);
+int qt_wince__read(int handle, void *buffer, unsigned int count);
+int qt_wince__write(int handle, const void *buffer, unsigned int count);
+
+#endif // Q_OS_WINCE
+#endif // QSVGFUNCTIONS_WCE_H
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index d7132af..1384138 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -38,6 +38,15 @@ SOURCES += \
     qgraphicssvgitem.cpp    \
     qsvggenerator.cpp
 
+wince*: {
+    SOURCES += \
+        qsvgfunctions_wince.cpp
+    HEADERS += \
+        qsvgfunctions_wince.h
+}
+
+INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
+
 symbian:TARGET.UID3=0x2001B2E2
 
 contains(QT_CONFIG, system-zlib) {