diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-06-28 15:05:53 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-06-28 15:05:53 +0000 |
| commit | 5ed738eb52c269eb2ff89ee743fdf345efea16d9 (patch) | |
| tree | de0afdf65d539d351f02a56d09abda0c39f56581 /plugins/MirOTR/libgcrypt-1.4.6/src | |
| parent | a1b54aadf426b4ce2ce3c900a889f53f1eec6bce (diff) | |
compilation fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@669 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirOTR/libgcrypt-1.4.6/src')
| -rw-r--r-- | plugins/MirOTR/libgcrypt-1.4.6/src/ath.c | 4 | ||||
| -rw-r--r-- | plugins/MirOTR/libgcrypt-1.4.6/src/fips.c | 4 | ||||
| -rw-r--r-- | plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/plugins/MirOTR/libgcrypt-1.4.6/src/ath.c b/plugins/MirOTR/libgcrypt-1.4.6/src/ath.c index 0c274cde0c..a3d300c1b9 100644 --- a/plugins/MirOTR/libgcrypt-1.4.6/src/ath.c +++ b/plugins/MirOTR/libgcrypt-1.4.6/src/ath.c @@ -224,7 +224,7 @@ ath_read (int fd, void *buf, size_t nbytes) if (ops_set && ops.read) return (*ops.read) (fd, buf, nbytes); else - return read (fd, buf, nbytes); + return _read (fd, buf, nbytes); } @@ -234,7 +234,7 @@ ath_write (int fd, const void *buf, size_t nbytes) if (ops_set && ops.write) return (*ops.write) (fd, buf, nbytes); else - return write (fd, buf, nbytes); + return _write (fd, buf, nbytes); } diff --git a/plugins/MirOTR/libgcrypt-1.4.6/src/fips.c b/plugins/MirOTR/libgcrypt-1.4.6/src/fips.c index 91f30427c5..8709dae96d 100644 --- a/plugins/MirOTR/libgcrypt-1.4.6/src/fips.c +++ b/plugins/MirOTR/libgcrypt-1.4.6/src/fips.c @@ -128,7 +128,7 @@ _gcry_initialize_fips_mode (int force) file. The filename is hardwired so that there won't be any confusion on whether /etc/gcrypt/ or /usr/local/etc/gcrypt/ is actually used. The file itself may be empty. */ - if ( !access (FIPS_FORCE_FILE, F_OK) ) + if ( !_access (FIPS_FORCE_FILE, F_OK) ) { gcry_assert (!no_fips_mode_required); goto leave; @@ -156,7 +156,7 @@ _gcry_initialize_fips_mode (int force) } else if ((saved_errno = errno) != ENOENT && saved_errno != EACCES - && !access ("/proc/version", F_OK) ) + && !_access ("/proc/version", F_OK) ) { /* Problem reading the fips file despite that we have the proc file system. We better stop right away. */ diff --git a/plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h b/plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h index 8c110fec0b..ef4196c266 100644 --- a/plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h +++ b/plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h @@ -25,6 +25,7 @@ #include <stdlib.h> #include <stdarg.h> #include <string.h> +#include <tchar.h> #include <gpg-error.h> |