# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1387126918 0
# Node ID 72a9467f93fc5510ba331627ca9581719053c51c
# Parent  f22989bb76320d7d68b84212f765e77d01567b11
Only make promote_args_lazy() available if WITH_NUMBER_TYPES.

src/ChangeLog addition:

2013-12-15  Aidan Kehoe  <kehoea@parhasard.net>

	* number.h:
	Only make promote_args_lazy() available on builds
	WITH_NUMBER_TYPES, in case linking complains about promote_args()
	not being available.

tests/ChangeLog addition:

2013-12-15  Aidan Kehoe  <kehoea@parhasard.net>

	* automated/lisp-tests.el (character):
	Remove a debugging statement from this.

diff -r f22989bb7632 -r 72a9467f93fc src/ChangeLog
--- a/src/ChangeLog	Sun Dec 15 10:38:19 2013 +0000
+++ b/src/ChangeLog	Sun Dec 15 17:01:58 2013 +0000
@@ -1,3 +1,10 @@
+2013-12-15  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* number.h:
+	Only make promote_args_lazy() available on builds
+	WITH_NUMBER_TYPES, in case linking complains about promote_args()
+	not being available.
+
 2013-12-15  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* bytecode.c (bytecode_arithcompare):
diff -r f22989bb7632 -r 72a9467f93fc src/number.h
--- a/src/number.h	Sun Dec 15 10:38:19 2013 +0000
+++ b/src/number.h	Sun Dec 15 17:01:58 2013 +0000
@@ -384,6 +384,8 @@
 extern enum number_type get_number_type (Lisp_Object);
 extern enum number_type promote_args (Lisp_Object *, Lisp_Object *);
 
+#ifdef WITH_NUMBER_TYPES
+
 /* promote_args() *always* converts a marker argument to a fixnum.
 
    Unfortunately, for a marker with byte position N, getting the (character)
@@ -409,7 +411,6 @@
   return (enum lazy_number_type) promote_args (obj1, obj2);
 }
 
-#ifdef WITH_NUMBER_TYPES
 DECLARE_INLINE_HEADER (
 int
 non_fixnum_number_p (Lisp_Object object))
diff -r f22989bb7632 -r 72a9467f93fc tests/ChangeLog
--- a/tests/ChangeLog	Sun Dec 15 10:38:19 2013 +0000
+++ b/tests/ChangeLog	Sun Dec 15 17:01:58 2013 +0000
@@ -1,3 +1,8 @@
+2013-12-15  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* automated/lisp-tests.el (character):
+	Remove a debugging statement from this.
+
 2013-12-15  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* automated/face-tests.el:
diff -r f22989bb7632 -r 72a9467f93fc tests/automated/lisp-tests.el
--- a/tests/automated/lisp-tests.el	Sun Dec 15 10:38:19 2013 +0000
+++ b/tests/automated/lisp-tests.el	Sun Dec 15 17:01:58 2013 +0000
@@ -3091,7 +3091,6 @@
 			     context)))
 	              markers))))
     (with-temp-buffer
-      (princ "hello there, in with-temp-buffer\n" (get-buffer "*scratch*"))
       (loop for ii from 0 to 100
 	do (progn
 	     (insert " " character " " character " " character " "