Commit 8e2d7ef2 authored by Jan Djärv's avatar Jan Djärv
Browse files

* gnutls.c (gnutls_audit_log_function): Only declare and define if

HAVE_GNUTLS3.

* xfaces.c (NEAR_SAME_COLOR_THRESHOLD): Move inside HAVE_WINDOW_SYSTEM.

Fixes: debbugs:16001
parent f80e1bb6
2013-11-30 Jan Djärv <jan.h.d@swipnet.se>
* xfaces.c (NEAR_SAME_COLOR_THRESHOLD): Move inside HAVE_WINDOW_SYSTEM.
* gnutls.c (gnutls_audit_log_function): Only declare and define if
HAVE_GNUTLS3 (Bug#16001).
* xdisp.c (redisplay_internal): Call request_sigio at end_of_redisplay
if interrupts are deferred (Bug#15801).
......
......@@ -55,8 +55,10 @@ static Lisp_Object QCgnutls_bootprop_verify_hostname_error;
static Lisp_Object QCgnutls_bootprop_callbacks_verify;
static void gnutls_log_function (int, const char *);
static void gnutls_audit_log_function (gnutls_session_t, const char *);
static void gnutls_log_function2 (int, const char*, const char*);
#ifdef HAVE_GNUTLS3
static void gnutls_audit_log_function (gnutls_session_t, const char *);
#endif
#ifdef WINDOWSNT
......@@ -261,6 +263,7 @@ init_gnutls_functions (void)
#endif /* !WINDOWSNT */
#ifdef HAVE_GNUTLS3
/* Function to log a simple audit message. */
static void
gnutls_audit_log_function (gnutls_session_t session, const char* string)
......@@ -270,6 +273,7 @@ gnutls_audit_log_function (gnutls_session_t session, const char* string)
message ("gnutls.c: [audit] %s", string);
}
}
#endif
/* Function to log a simple message. */
static void
......
......@@ -912,8 +912,6 @@ load_pixmap (struct frame *f, Lisp_Object name)
X Colors
***********************************************************************/
#define NEAR_SAME_COLOR_THRESHOLD 30000
/* Parse RGB_LIST, and fill in the RGB fields of COLOR.
RGB_LIST should contain (at least) 3 lisp integers.
Return 0 if there's a problem with RGB_LIST, otherwise return 1. */
......@@ -1265,6 +1263,8 @@ load_color (struct frame *f, struct face *face, Lisp_Object name,
#ifdef HAVE_WINDOW_SYSTEM
#define NEAR_SAME_COLOR_THRESHOLD 30000
/* Load colors for face FACE which is used on frame F. Colors are
specified by slots LFACE_BACKGROUND_INDEX and LFACE_FOREGROUND_INDEX
of ATTRS. If the background color specified is not supported on F,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment