1 files changed, 8 insertions, 50 deletions
diff --git a/src/corelib/kernel/qfunctions_wince.cpp b/src/corelib/kernel/qfunctions_wince.cpp
index 8f8fc21313..0619503c51 100644
--- a/src/corelib/kernel/qfunctions_wince.cpp
+++ b/src/corelib/kernel/qfunctions_wince.cpp
@@ -36,13 +36,16 @@
 #include <winbase.h>
 #include <kfuncs.h>
 #include <stdio.h>
-#include <altcecrt.h>
+#if _WIN32_WCE < 0x800
+#  include <altcecrt.h>
+#else
+#  include <fcntl.h>
+#endif
 
 #include "qplatformdefs.h"
 #include "qfunctions_wince.h"
+#include "qfunctions_fake_env_p.h"
 #include "qstring.h"
-#include "qbytearray.h"
-#include "qhash.h"
 
 QT_USE_NAMESPACE
 
@@ -93,7 +96,9 @@ FILETIME qt_wince_time_tToFt( time_t tt )
 }
 
 // File I/O ---------------------------------------------------------
+#if _WIN32_WCE < 0x800
 int errno = 0;
+#endif
 
 int qt_wince__getdrive( void )
 {
@@ -393,51 +398,4 @@ int qt_wince__getpid()
 #ifdef __cplusplus
 } // extern "C"
 #endif
-// Environment ------------------------------------------------------
-inline QHash<QByteArray, QByteArray>& qt_app_environment()
-{
-    static QHash<QByteArray, QByteArray> internalEnvironment;
-    return internalEnvironment;
-}
-
-errno_t qt_wince_getenv_s(size_t* sizeNeeded, char* buffer, size_t bufferSize, const char* varName)
-{
-    if (!sizeNeeded)
-        return EINVAL;
-
-    if (!qt_app_environment().contains(varName)) {
-        if (buffer)
-            buffer[0] = '\0';
-        return ENOENT;
-    }
-
-    QByteArray value = qt_app_environment().value(varName);
-    if (!value.endsWith('\0')) // win32 guarantees terminated string
-        value.append('\0');
-
-    if (bufferSize < (size_t)value.size()) {
-        *sizeNeeded = value.size();
-        return 0;
-    }
-
-    strcpy(buffer, value.constData());
-    return 0;
-}
-
-errno_t qt_wince__putenv_s(const char* varName, const char* value)
-{
-    QByteArray input = value;
-    if (input.isEmpty()) {
-        if (qt_app_environment().contains(varName))
-            qt_app_environment().remove(varName);
-    } else {
-        // win32 guarantees terminated string
-        if (!input.endsWith('\0'))
-            input.append('\0');
-        qt_app_environment()[varName] = input;
-    }
-
-    return 0;
-}
-
 #endif // Q_OS_WINCE