From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sat, 30 Nov 2013 13:31:39 +0000 (+0100)
Subject: * gnutls.c (gnutls_audit_log_function): Only declare and define if
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~626
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8e2d7ef25e3d41639d21fe1e232a277c479946b0;p=emacs.git

* 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
---

diff --git a/src/ChangeLog b/src/ChangeLog
index d75324a728b..e8bbc9ab7eb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 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).
 
diff --git a/src/gnutls.c b/src/gnutls.c
index 82b2fc8baa4..5a296166cdd 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -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
diff --git a/src/xfaces.c b/src/xfaces.c
index b6e0abc2f96..8a74c92b10d 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -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,