-#define GNUTLS_PROCESS_USABLE(proc) (GNUTLS_INITSTAGE(proc) >= GNUTLS_STAGE_READY)
-
-#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) do { if (level <= max) { gnutls_log_function2 (level, "(Emacs) " string, extra); } } while (0)
-
-extern EMACS_INT
-emacs_gnutls_write (struct Lisp_Process *proc, const char *buf, EMACS_INT nbyte);
-extern EMACS_INT
-emacs_gnutls_read (struct Lisp_Process *proc, char *buf, EMACS_INT nbyte);
-
-extern int emacs_gnutls_record_check_pending (gnutls_session_t state);
+#define GNUTLS_PROCESS_USABLE(proc) \
+ (GNUTLS_INITSTAGE (proc) >= GNUTLS_STAGE_READY)
+
+#define GNUTLS_LOG(level, max, string) \
+ do { \
+ if ((level) <= (max)) \
+ gnutls_log_function (level, "(Emacs) " string); \
+ } while (false)
+
+#define GNUTLS_LOG2(level, max, string, extra) \
+ do { \
+ if ((level) <= (max)) \
+ gnutls_log_function2 (level, "(Emacs) " string, extra); \
+ } while (false)
+
+#define GNUTLS_LOG2i(level, max, string, extra) \
+ do { \
+ if ((level) <= (max)) \
+ gnutls_log_function2i (level, "(Emacs) " string, extra); \
+ } while (false)
+
+extern ptrdiff_t
+emacs_gnutls_write (struct Lisp_Process *proc, const char *buf, ptrdiff_t nbyte);
+extern ptrdiff_t
+emacs_gnutls_read (struct Lisp_Process *proc, char *buf, ptrdiff_t nbyte);
+
+extern ptrdiff_t emacs_gnutls_record_check_pending (gnutls_session_t state);
+#ifdef WINDOWSNT