From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:50 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12. --- libtdenetwork/libgpgme-copy/assuan/assuan-uds.c | 2 +- libtdenetwork/libgpgme-copy/assuan/assuan.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libtdenetwork/libgpgme-copy/assuan') diff --git a/libtdenetwork/libgpgme-copy/assuan/assuan-uds.c b/libtdenetwork/libgpgme-copy/assuan/assuan-uds.c index 77945fb50..e9e81016c 100644 --- a/libtdenetwork/libgpgme-copy/assuan/assuan-uds.c +++ b/libtdenetwork/libgpgme-copy/assuan/assuan-uds.c @@ -46,7 +46,7 @@ #ifdef USE_DESCRIPTOR_PASSING /* Provide replacement for missing CMSG maccros. We assume that - size_t matches the alignment requirement. */ + size_t matches the tqalignment requirement. */ #define MY_ALIGN(n) ((((n))+ sizeof(size_t)-1) & (size_t)~(sizeof(size_t)-1)) #ifndef CMSG_SPACE #define CMSG_SPACE(n) (MY_ALIGN(sizeof(struct cmsghdr)) + MY_ALIGN((n))) diff --git a/libtdenetwork/libgpgme-copy/assuan/assuan.h b/libtdenetwork/libgpgme-copy/assuan/assuan.h index cdf0445ab..8d0a3960d 100644 --- a/libtdenetwork/libgpgme-copy/assuan/assuan.h +++ b/libtdenetwork/libgpgme-copy/assuan/assuan.h @@ -283,9 +283,9 @@ extern "C" #define ASSUAN_Inquire_Error 121 #define ASSUAN_Invalid_Option 122 #define ASSUAN_Invalid_Index 123 -#define ASSUAN_Unexpected_Status 124 +#define ASSUAN_Unexpected_tqStatus 124 #define ASSUAN_Unexpected_Data 125 -#define ASSUAN_Invalid_Status 126 +#define ASSUAN_Invalid_tqStatus 126 #define ASSUAN_Locale_Problem 127 #endif #define ASSUAN_Not_Confirmed 128 -- cgit v1.2.1