; Revert "Ensure undo-boundary after insert-file-contents."

[gnu-emacs] / src / gnutls.h

diff --git a/src/gnutls.h b/src/gnutls.h
index 4adaad4897d56f352e71a01991fab1f9d0b3a6e1..e9348e7423e8f43ca205f7e9241181ee6b6cf54c 100644 (file)
--- a/src/gnutls.h
+++ b/src/gnutls.h
@@ -1,12 +1,12 @@
 /* GnuTLS glue for GNU Emacs.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,6 +23,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 
+#include "lisp.h"
+
 /* This limits the attempts to handshake per process (connection).  */
 #define GNUTLS_EMACS_HANDSHAKES_LIMIT 100
 
@@ -57,19 +59,19 @@ typedef enum
   do {                                                         \
     if ((level) <= (max))                                      \
       gnutls_log_function (level, "(Emacs) " string);          \
-  } while (0)
+  } while (false)
 
 #define GNUTLS_LOG2(level, max, string, extra)                 \
   do {                                                         \
     if ((level) <= (max))                                      \
       gnutls_log_function2 (level, "(Emacs) " string, extra);  \
-  } while (0)
+  } while (false)
 
 #define GNUTLS_LOG2i(level, max, string, extra)                        \
   do {                                                         \
     if ((level) <= (max))                                      \
       gnutls_log_function2i (level, "(Emacs) " string, extra); \
-  } while (0)
+  } while (false)
 
 extern ptrdiff_t
 emacs_gnutls_write (struct Lisp_Process *proc, const char *buf, ptrdiff_t nbyte);
@@ -81,9 +83,10 @@ extern ptrdiff_t emacs_gnutls_record_check_pending (gnutls_session_t state);
 extern void emacs_gnutls_transport_set_errno (gnutls_session_t state, int err);
 #endif
 extern Lisp_Object emacs_gnutls_deinit (Lisp_Object);
-
-extern void syms_of_gnutls (void);
+extern Lisp_Object emacs_gnutls_global_init (void);
 
 #endif
 
+extern void syms_of_gnutls (void);
+
 #endif