g13: Move 'call-gpg.c' to common.
[gnupg.git] / common / asshelp.h
index 08c3c8c..35d2115 100644 (file)
@@ -34,6 +34,7 @@
 #include <gpg-error.h>
 
 #include "session-env.h"
+#include "util.h"
 
 /*-- asshelp.c --*/
 
@@ -58,7 +59,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
                      const char *opt_lc_ctype,
                      const char *opt_lc_messages,
                      session_env_t session_env,
-                     int verbose, int debug,
+                     int autostart, int verbose, int debug,
                      gpg_error_t (*status_cb)(ctrl_t, int, ...),
                      ctrl_t status_cb_arg);
 
@@ -69,7 +70,7 @@ start_new_dirmngr (assuan_context_t *r_ctx,
                    gpg_err_source_t errsource,
                    const char *homedir,
                    const char *dirmngr_program,
-                   int verbose, int debug,
+                   int autostart, int verbose, int debug,
                    gpg_error_t (*status_cb)(ctrl_t, int, ...),
                    ctrl_t status_cb_arg);
 
@@ -81,11 +82,11 @@ start_new_dirmngr (assuan_context_t *r_ctx,
 gpg_error_t print_assuan_status (assuan_context_t ctx,
                                  const char *keyword,
                                  const char *format,
-                                 ...) JNLIB_GCC_A_PRINTF(3,4);
+                                 ...) GPGRT_ATTR_PRINTF(3,4);
 gpg_error_t vprint_assuan_status (assuan_context_t ctx,
                                   const char *keyword,
                                   const char *format,
-                                  va_list arg_ptr) JNLIB_GCC_A_PRINTF(3,0);
+                                  va_list arg_ptr) GPGRT_ATTR_PRINTF(3,0);
 
 
 #endif /*GNUPG_COMMON_ASSHELP_H*/