GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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.
This commit is contained in:
Marcus Brinkmann 2003-10-06 13:24:13 +00:00
parent 5168a8d5be
commit 4cb6f77a32
5 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gpgme/ChangeLog
View File

@ -1,5 +1,14 @@
2003-10-06 Marcus Brinkmann <marcus@g10code.de> 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>, * rungpg.c: Do not include <time.h>, <sys/time.h>, <sys/types.h>,
<signal.h>, <fcntl.h>, or "unistd.h". <signal.h>, <fcntl.h>, or "unistd.h".

5
gpgme/ath.h
View File

@ -20,6 +20,11 @@
#ifndef ATH_H #ifndef ATH_H
#define 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/types.h>
#include <sys/socket.h> #include <sys/socket.h>

2
gpgme/conversion.c
View File

@ -34,7 +34,7 @@
represent. Returns -1 if one of the characters is not a represent. Returns -1 if one of the characters is not a
hexadecimal digit. */ hexadecimal digit. */
int int
_gpgme_hextobyte (const unsigned char *str) _gpgme_hextobyte (const char *str)
{ {
int val = 0; int val = 0;
int i; int i;

2
gpgme/gpgme.h
View File

@ -297,7 +297,7 @@ gpgme_validity_t;
typedef enum typedef enum
{ {
GPGME_PROTOCOL_OpenPGP = 0, /* The default mode. */ GPGME_PROTOCOL_OpenPGP = 0, /* The default mode. */
GPGME_PROTOCOL_CMS = 1, GPGME_PROTOCOL_CMS = 1
} }
gpgme_protocol_t; gpgme_protocol_t;

2
gpgme/util.h
View File

@ -50,7 +50,7 @@ int asprintf (char **result, const char *format, ...);
/* Convert two hexadecimal digits from STR to the value they /* Convert two hexadecimal digits from STR to the value they
represent. Returns -1 if one of the characters is not a represent. Returns -1 if one of the characters is not a
hexadecimal digit. */ 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 /* 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 buffer *DESTP which is LEN bytes long. If LEN is zero, then a