[Emacs-diffs] trunk r115305: * gnutls.c (gnutls_audit_log_function): Only declare and define if

[Jan D.]

------------------------------------------------------------
revno: 115305
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16001
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2013-11-30 14:31:39 +0100
message:
  * gnutls.c (gnutls_audit_log_function): Only declare and define if
  HAVE_GNUTLS3.
  
  * xfaces.c (NEAR_SAME_COLOR_THRESHOLD): Move inside HAVE_WINDOW_SYSTEM.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/gnutls.c                   gnutls.c-20100926054902-dzayyj6wycit6kzn-3
  src/xfaces.c                   xfaces.c-20091113204419-o5vbwnq5f7feedwu-560

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-11-30 12:37:16 +0000
+++ b/src/ChangeLog     2013-11-30 13:31:39 +0000
@@ -1,5 +1,10 @@
 2013-11-30  Jan Djärv  <address@hidden>
 
+       * 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).
 

=== modified file 'src/gnutls.c'
--- a/src/gnutls.c      2013-11-05 05:32:19 +0000
+++ b/src/gnutls.c      2013-11-30 13:31:39 +0000
@@ -55,8 +55,10 @@
 static Lisp_Object QCgnutls_bootprop_callbacks_verify;
 
 static void gnutls_log_function (int, 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 *);
-static void gnutls_log_function2 (int, const char*, const char*);
+#endif
 
 
 #ifdef WINDOWSNT
@@ -261,6 +263,7 @@
 #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 @@
       message ("gnutls.c: [audit] %s", string);
     }
 }
+#endif
 
 /* Function to log a simple message.  */
 static void

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2013-11-30 09:25:31 +0000
+++ b/src/xfaces.c      2013-11-30 13:31:39 +0000
@@ -912,8 +912,6 @@
                                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 @@
 
 #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,