From 4cb6f77a326b92b98f26ecb5352cc6082c7d8918 Mon Sep 17 00:00:00 2001
From: Marcus Brinkmann <mb@g10code.com>
Date: Mon, 6 Oct 2003 13:24:13 +0000
Subject: [PATCH] 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.
---
 gpgme/ChangeLog    | 9 +++++++++
 gpgme/ath.h        | 5 +++++
 gpgme/conversion.c | 2 +-
 gpgme/gpgme.h      | 2 +-
 gpgme/util.h       | 2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 42929deb..a817a1e5 100644
--- 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 54f74d95..07d19ad9 100644
--- 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 d889aeb9..25de2693 100644
--- 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 bed03145..aa46fe82 100644
--- 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 c6abc458..c0873554 100644
--- 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