Merge pull request #754 from mloskot/ml/remove-wince

Remove Windows CE cruft (wince/msvc80)

4 files changed, 3 insertions, 82 deletions

diff --git a/src/pj_open_lib.c b/src/pj_open_lib.c
index 4eaefba1..054853c6 100644
--- a/src/pj_open_lib.c
+++ b/src/pj_open_lib.c
@@ -118,8 +118,6 @@ pj_open_lib_ex(projCtx ctx, const char *name, const char *mode,
     static const char dir_chars[] = "/";
 #endif
 
-#ifndef _WIN32_WCE
-
     if( out_full_filename != NULL && out_full_filename_size > 0 )
         out_full_filename[0] = '\0';
 
@@ -205,9 +203,6 @@ pj_open_lib_ex(projCtx ctx, const char *name, const char *mode,
             fid == NULL ? "failed" : "succeeded" );
 
     return(fid);
-#else
-    return NULL;
-#endif /* _WIN32_WCE */
 }
 
 /************************************************************************/
diff --git a/src/pj_strtod.c b/src/pj_strtod.c
index 4c03a661..90d0b2e5 100644
--- a/src/pj_strtod.c
+++ b/src/pj_strtod.c
@@ -75,7 +75,7 @@ double pj_atof( const char* nptr )
 static char* pj_replace_point_by_locale_point(const char* pszNumber, char point,
                                               char* pszWorkBuffer)
 {
-#if !defined(HAVE_LOCALECONV) || defined(_WIN32_WCE)
+#if !defined(HAVE_LOCALECONV)
 
 #if defined(_MSC_VER)  /* Visual C++ */
 #pragma message("localeconv not available")
diff --git a/src/proj_config.h.wince b/src/proj_config.h.wince
deleted file mode 100644
index 9e2c8a67..00000000
--- a/src/proj_config.h.wince
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Windows CE platform config.
- */
-#ifndef _WIN32_WCE
-# error This version of proj_config.h header is dedicated for Windows CE platform!
-#endif
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Enabled for Java/JNI Support */
-#undef JNI_ENABLED
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
diff --git a/src/projects.h b/src/projects.h
index f22ae3a5..41f4aa3c 100644
--- a/src/projects.h
+++ b/src/projects.h
@@ -97,14 +97,6 @@ typedef long pj_int32;
 extern double hypot(double, double);
 #endif
 
-#ifdef _WIN32_WCE
-#  include <wce_stdlib.h>
-#  include <wce_stdio.h>
-#  define rewind wceex_rewind
-#  define getenv wceex_getenv
-#  define hypot _hypot
-#endif
-
 /* If we still haven't got M_PI*, we rely on our own defines.
  * For example, this is necessary when compiling with gcc and
  * the -ansi flag.
@@ -136,11 +128,11 @@ extern double hypot(double, double);
 #endif
 
 /* Use WIN32 as a standard windows 32 bit declaration */
-#if defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE)
+#if defined(_WIN32) && !defined(WIN32)
 #  define WIN32
 #endif
 
-#if defined(_WINDOWS) && !defined(WIN32) && !defined(_WIN32_WCE)
+#if defined(_WINDOWS) && !defined(WIN32)
 #  define WIN32
 #endif