From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 15 Jan 2018 12:15:53 +0000 (+0200)
Subject: ; * src/coding.h (surrogates_to_codepoint): Add prototype.
X-Git-Tag: emacs-27.0.90~5882
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f3fafd24175a8918996c824db17c670c13fb380d;p=emacs.git

; * src/coding.h (surrogates_to_codepoint): Add prototype.
---

diff --git a/src/coding.h b/src/coding.h
index d90b799d76e..165c1b29b71 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -674,18 +674,6 @@ struct coding_system
 #define UTF_16_LOW_SURROGATE_P(val) \
   (((val) & 0xFC00) == 0xDC00)
 
-/* Return the Unicode code point for the given UTF-16 surrogates.  */
-
-INLINE int
-surrogates_to_codepoint (int low, int high)
-{
-  eassert (0 <= low && low <= 0xFFFF);
-  eassert (0 <= high && high <= 0xFFFF);
-  eassert (UTF_16_LOW_SURROGATE_P (low));
-  eassert (UTF_16_HIGH_SURROGATE_P (high));
-  return 0x10000 + (low - 0xDC00) + ((high - 0xD800) * 0x400);
-}
-
 /* Extern declarations.  */
 extern Lisp_Object code_conversion_save (bool, bool);
 extern bool encode_coding_utf_8 (struct coding_system *);
@@ -712,6 +700,8 @@ extern void decode_coding_object (struct coding_system *,
 extern void encode_coding_object (struct coding_system *,
                                   Lisp_Object, ptrdiff_t, ptrdiff_t,
                                   ptrdiff_t, ptrdiff_t, Lisp_Object);
+/* Defined in this file.  */
+INLINE int surrogates_to_codepoint (int, int);
 
 #if defined (WINDOWSNT) || defined (CYGWIN)
 
@@ -756,6 +746,18 @@ extern Lisp_Object from_unicode_buffer (const wchar_t *wstr);
   } while (false)
 
 
+/* Return the Unicode code point for the given UTF-16 surrogates.  */
+
+INLINE int
+surrogates_to_codepoint (int low, int high)
+{
+  eassert (0 <= low && low <= 0xFFFF);
+  eassert (0 <= high && high <= 0xFFFF);
+  eassert (UTF_16_LOW_SURROGATE_P (low));
+  eassert (UTF_16_HIGH_SURROGATE_P (high));
+  return 0x10000 + (low - 0xDC00) + ((high - 0xD800) * 0x400);
+}
+
 extern Lisp_Object preferred_coding_system (void);