aboutsummaryrefslogtreecommitdiffstats
path: root/g10/keyring.h
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2006-04-19 11:26:11 +0000
committerWerner Koch <[email protected]>2006-04-19 11:26:11 +0000
commit29b23dea9731e8f258211bc6fd733d205c18e2a8 (patch)
treeff2a0f66bda0c1f050e8fa00cbf610e18b91c9f7 /g10/keyring.h
parent2006-04-14 Marcus Brinkmann <[email protected]> (diff)
downloadgnupg-29b23dea9731e8f258211bc6fd733d205c18e2a8.tar.gz
gnupg-29b23dea9731e8f258211bc6fd733d205c18e2a8.zip
Merged with gpg 1.4.3 code.
The gpg part does not yet build.
Diffstat (limited to 'g10/keyring.h')
-rw-r--r--g10/keyring.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/g10/keyring.h b/g10/keyring.h
index 528557a70..773d7b492 100644
--- a/g10/keyring.h
+++ b/g10/keyring.h
@@ -15,14 +15,13 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
*/
#ifndef GPG_KEYRING_H
#define GPG_KEYRING_H 1
-#include "global.h"
-
typedef struct keyring_handle *KEYRING_HANDLE;
@@ -41,6 +40,6 @@ int keyring_delete_keyblock (KEYRING_HANDLE hd);
int keyring_search_reset (KEYRING_HANDLE hd);
int keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc,
size_t ndesc, size_t *descindex);
-int keyring_rebuild_cache (void *);
+int keyring_rebuild_cache (void *token,int noisy);
#endif /*GPG_KEYRING_H*/