2005-03-24 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac (AH_BOTTOM): Removed.

gpgme/
2005-03-24  Marcus Brinkmann  <marcus@g10code.de>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index 6e85315f86c64fc90f40cbef29878eba0f5cacf9..a55f2ae6221eb4222af78f9125c9b68a3349b767 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-24  Marcus Brinkmann  <marcus@g10code.de>
+
+       * configure.ac (AH_BOTTOM): Removed.
+
 2005-03-09  Werner Koch  <wk@g10code.com>
 
        * acinclude.m4 (GNUPG_CHECK_VA_COPY): Assume no when cross-compiling.

diff --git a/configure.ac b/configure.ac
index b62e3578fba1b0cc4071091c93e1d35dc9bbe041..6a31bd5bf3b4a4f7e6dd2bc23a4e3240a3db96c1 100644 (file)
--- 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 be433844c88bd2323b6224b5c41c61ec018078d3..6ee994df7dd8c6d93c762379b5709b7cce16f561 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,13 @@
+2005-03-24  Marcus Brinkmann  <marcus@g10code.de>
+
+       * 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  <marcus@g10code.de>
 
        * io.h: Rename to ...

diff --git a/gpgme/data-compat.c b/gpgme/data-compat.c
index b55fd61ba4469deb0aefde16a423076c5770f411..91fa6bed13945603534956198703b7d9318503d6 100644 (file)
--- 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
-
-
 \f
 /* 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 39f60af31efc46431049f0960122305f5a4ba457..144dc8636f34ee327c915c1a0e3563b03b1910b5 100644 (file)
--- 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
-
-
 \f
 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 02ada89e3ab0f86c8dcfbd1d27c5712838451c79..feb4a60a892dd09e1897983b418bc43a38afc11a 100644 (file)
--- a/gpgme/data.h
+++ b/gpgme/data.h
@@ -30,10 +30,6 @@
 
 #include "gpgme.h"
 
-#ifdef _WIN32
-# define EOPNOTSUPP      95
-#endif
-
 \f
 /* 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