2005-03-24 Marcus Brinkmann <[email protected]>

	* configure.ac (AH_BOTTOM): Removed.

gpgme/
2005-03-24  Marcus Brinkmann  <[email protected]>

	* data.h (EOPNOTSUPP) [_WIN32]: Remove definition.
	* data.c (EOPNOTSUPP) [HAVE_W32_SYSTEM]: Remove definition.
	(gpgme_data_read, gpgme_data_write, gpgme_data_seek): Return
	ENOSYS instead EOPNOTSUPP.
	* data-compat.c (EOPNOTSUPP) [HAVE_W32_SYSTEM]: Remove definition.
	(gpgme_error_to_errno): Map GPG_ERR_NOT_SUPPORTED
	to ENOSYS.

6 files changed, 18 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index 6e85315f..a55f2ae6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-24  Marcus Brinkmann  <[email protected]>
+
+	* configure.ac (AH_BOTTOM): Removed.
+
 2005-03-09  Werner Koch  <[email protected]>
 
 	* acinclude.m4 (GNUPG_CHECK_VA_COPY): Assume no when cross-compiling.
diff --git a/configure.ac b/configure.ac
index b62e3578..6a31bd5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,17 +68,6 @@ AH_VERBATIM([_REENTRANT],
 # define _REENTRANT 1
 #endif])
 
-AH_BOTTOM([
-/* Some environments miss the definition for EOPNOTSUPP.  We provide
-   the error code here and test where neded whether it should be
-   defined.  Can't do the test here due to the order of includes.  */
-#ifdef HAVE_W32_SYSTEM
-#define VALUE_FOR_EOPNOTSUPP 95
-#endif /*!HAVE_W32_SYSTEM*/
-
-])
-
-
 AC_PROG_CC
 
 
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index be433844..6ee994df 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,15 @@
 2005-03-24  Marcus Brinkmann  <[email protected]>
 
+	* data.h (EOPNOTSUPP) [_WIN32]: Remove definition.
+	* data.c (EOPNOTSUPP) [HAVE_W32_SYSTEM]: Remove definition.
+	(gpgme_data_read, gpgme_data_write, gpgme_data_seek): Return
+	ENOSYS instead EOPNOTSUPP.
+	* data-compat.c (EOPNOTSUPP) [HAVE_W32_SYSTEM]: Remove definition.
+	(gpgme_error_to_errno): Map GPG_ERR_NOT_SUPPORTED
+	to ENOSYS.
+
+2005-03-24  Marcus Brinkmann  <[email protected]>
+
 	* io.h: Rename to ...
 	* priv-io.h: ... this.
 	* Makefile.am (libgpgme_real_la_SOURCES): Change io.h to priv-io.h.
diff --git a/gpgme/data-compat.c b/gpgme/data-compat.c
index b55fd61b..91fa6bed 100644
--- a/gpgme/data-compat.c
+++ b/gpgme/data-compat.c
@@ -30,11 +30,6 @@
 #include "data.h"
 #include "util.h"
 
-#if defined(HAVE_W32_SYSTEM) && !defined(EOPNOTSUPP)
-#define EOPNOTSUPP VALUE_FOR_EOPNOTSUPP
-#endif
-
-
 
 /* Create a new data buffer filled with LENGTH bytes starting from
    OFFSET within the file FNAME or stream STREAM (exactly one must be
@@ -145,7 +140,7 @@ gpgme_error_to_errno (gpgme_error_t err)
       errno = EINVAL;
       return -1;
     case GPG_ERR_NOT_SUPPORTED:
-      errno = EOPNOTSUPP;
+      errno = ENOSYS;
       return -1;
     default:
       /* FIXME: Yeah, well.  */
diff --git a/gpgme/data.c b/gpgme/data.c
index 39f60af3..144dc863 100644
--- a/gpgme/data.c
+++ b/gpgme/data.c
@@ -33,11 +33,6 @@
 #include "ops.h"
 #include "priv-io.h"
 
-#if defined(HAVE_W32_SYSTEM) && !defined(EOPNOTSUPP)
-#define EOPNOTSUPP VALUE_FOR_EOPNOTSUPP
-#endif
-
-
 
 gpgme_error_t
 _gpgme_data_new (gpgme_data_t *r_dh, struct _gpgme_data_cbs *cbs)
@@ -80,7 +75,7 @@ gpgme_data_read (gpgme_data_t dh, void *buffer, size_t size)
     }
   if (!dh->cbs->read)
     {
-      errno = EOPNOTSUPP;
+      errno = ENOSYS;
       return -1;
     }
   return (*dh->cbs->read) (dh, buffer, size);
@@ -100,7 +95,7 @@ gpgme_data_write (gpgme_data_t dh, const void *buffer, size_t size)
     }
   if (!dh->cbs->write)
     {
-      errno = EOPNOTSUPP;
+      errno = ENOSYS;
       return -1;
     }
   return (*dh->cbs->write) (dh, buffer, size);
@@ -120,7 +115,7 @@ gpgme_data_seek (gpgme_data_t dh, off_t offset, int whence)
     }
   if (!dh->cbs->seek)
     {
-      errno = EOPNOTSUPP;
+      errno = ENOSYS;
       return -1;
     }
 
diff --git a/gpgme/data.h b/gpgme/data.h
index 02ada89e..feb4a60a 100644
--- a/gpgme/data.h
+++ b/gpgme/data.h
@@ -30,10 +30,6 @@
 
 #include "gpgme.h"
 
-#ifdef _WIN32
-# define EOPNOTSUPP      95
-#endif
-
 
 /* Read up to SIZE bytes into buffer BUFFER from the data object with
    the handle DH.  Return the number of characters read, 0 on EOF and