2003-10-06 Marcus Brinkmann <marcus@g10code.de>

	* ath.h [HAVE_SYS_SELECT_H]: Include <sys/select.h> for fd_set.
	[!HAVE_SYS_SELECT_H]: Include <sys/time.h>.

	* conversion.c (_gpgme_hextobyte): Drop "unsigned" from type of
	SRC argument.
	* util.h (_gpgme_hextobyte): Likewise for prototype.

	* gpgme.h: Remove trailing comma in enum.

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 42929debc17ed17c285b07eadf6e2e9f4872b0e0..a817a1e565130fde36bb74eba8031e3660a34b68 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,14 @@
 2003-10-06  Marcus Brinkmann  <marcus@g10code.de>
 
+       * ath.h [HAVE_SYS_SELECT_H]: Include <sys/select.h> for fd_set.
+       [!HAVE_SYS_SELECT_H]: Include <sys/time.h>.
+
+       * conversion.c (_gpgme_hextobyte): Drop "unsigned" from type of
+       SRC argument.
+       * util.h (_gpgme_hextobyte): Likewise for prototype.
+
+       * gpgme.h: Remove trailing comma in enum.
+
        * rungpg.c: Do not include <time.h>, <sys/time.h>, <sys/types.h>,
        <signal.h>, <fcntl.h>, or "unistd.h".
 

diff --git a/gpgme/ath.h b/gpgme/ath.h
index 54f74d95ffaefe0a301b013d646d35053e8cb39f..07d19ad9319027aca116303a25fb8d5b76f8e1a6 100644 (file)
--- a/gpgme/ath.h
+++ b/gpgme/ath.h
@@ -20,6 +20,11 @@
 #ifndef ATH_H
 #define ATH_H
 
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#else
+# include <sys/time.h>
+#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 

diff --git a/gpgme/conversion.c b/gpgme/conversion.c
index d889aeb9c75289d34e45e1e588b5c24cf5336c68..25de269300ac88f9765c9d16211cee36f84fad02 100644 (file)
--- a/gpgme/conversion.c
+++ b/gpgme/conversion.c
@@ -34,7 +34,7 @@
    represent.  Returns -1 if one of the characters is not a
    hexadecimal digit.  */
 int
-_gpgme_hextobyte (const unsigned char *str)
+_gpgme_hextobyte (const char *str)
 {
   int val = 0;
   int i;

diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h
index bed03145a9dfefd7d6b9efca21a95e28b7d86a8b..aa46fe8288f8b89cfc2749f6a96cc85ad98be1aa 100644 (file)
--- a/gpgme/gpgme.h
+++ b/gpgme/gpgme.h
@@ -297,7 +297,7 @@ gpgme_validity_t;
 typedef enum
   {
     GPGME_PROTOCOL_OpenPGP = 0,  /* The default mode.  */
-    GPGME_PROTOCOL_CMS     = 1,
+    GPGME_PROTOCOL_CMS     = 1
   }
 gpgme_protocol_t;
 

diff --git a/gpgme/util.h b/gpgme/util.h
index c6abc458a40046fb2f49989311812b9477631f67..c087355447a13d9e737cd0bf8b3f6530e50f0303 100644 (file)
--- a/gpgme/util.h
+++ b/gpgme/util.h
@@ -50,7 +50,7 @@ int asprintf (char **result, const char *format, ...);
 /* Convert two hexadecimal digits from STR to the value they
    represent.  Returns -1 if one of the characters is not a
    hexadecimal digit.  */
-int _gpgme_hextobyte (const unsigned char *str);
+int _gpgme_hextobyte (const char *str);
 
 /* Decode the C formatted string SRC and store the result in the
    buffer *DESTP which is LEN bytes long.  If LEN is zero, then a