diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-10-27 11:20:24 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-10-27 11:20:24 -0700 |
| commit | 929bb973dd3faf1655f03ac758942d5b009354ad (patch) | |
| tree | 56f50bd1940eae6c9aafc5a719584a355818dcbe /src/gnutls.h | |
| parent | dde1458174882077ca799d03f0adea91286650a3 (diff) | |
| parent | 87e68db4734d89bab693744ad210560da0c20a87 (diff) | |
| download | emacs-929bb973dd3faf1655f03ac758942d5b009354ad.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/gnutls.h')
| -rw-r--r-- | src/gnutls.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gnutls.h b/src/gnutls.h index 83eeb7247eb..ddb47137e6e 100644 --- a/src/gnutls.h +++ b/src/gnutls.h @@ -49,9 +49,9 @@ typedef enum #define GNUTLS_PROCESS_USABLE(proc) (GNUTLS_INITSTAGE(proc) >= GNUTLS_STAGE_READY) -#define GNUTLS_LOG(level, max, string) if (level <= max) { gnutls_log_function (level, "(Emacs) " string); } +#define GNUTLS_LOG(level, max, string) do { if (level <= max) { gnutls_log_function (level, "(Emacs) " string); } } while (0) -#define GNUTLS_LOG2(level, max, string, extra) if (level <= max) { gnutls_log_function2 (level, "(Emacs) " string, extra); } +#define GNUTLS_LOG2(level, max, string, extra) do { if (level <= max) { gnutls_log_function2 (level, "(Emacs) " string, extra); } } while (0) extern ptrdiff_t emacs_gnutls_write (struct Lisp_Process *proc, const char *buf, ptrdiff_t nbyte); @@ -60,6 +60,7 @@ emacs_gnutls_read (struct Lisp_Process *proc, char *buf, ptrdiff_t nbyte); extern int emacs_gnutls_record_check_pending (gnutls_session_t state); extern void emacs_gnutls_transport_set_errno (gnutls_session_t state, int err); +extern Lisp_Object emacs_gnutls_deinit (Lisp_Object); extern void syms_of_gnutls (void); |