Merge branch 'scratch/follow' of /home/acm/emacs/emacs.git/emacs-25 into scratch...

[gnu-emacs] / src / regex.h

diff --git a/src/regex.h b/src/regex.h
index 3dfecf0a7e5b363dfbcc306451711af3346389a8..eaa7729a5fba9488fa7971e2e71fc72d3b211ba6 100644 (file)
--- a/src/regex.h
+++ b/src/regex.h
@@ -167,6 +167,7 @@ typedef unsigned long reg_syntax_t;
 extern reg_syntax_t re_syntax_options;
 
 #ifdef emacs
+# include "lisp.h"
 /* In Emacs, this is the string or buffer in which we
    are matching.  It is used for looking up syntax properties.  */
 extern Lisp_Object re_match_object;
@@ -603,7 +604,9 @@ typedef wchar_t re_wchar_t;
 # define re_wctype_to_bit(cc) 0
 #else
 # define CHAR_CLASS_MAX_LENGTH  9 /* Namely, `multibyte'.  */
-# define btowc(c) c
+# ifndef emacs
+#  define btowc(c) c
+# endif
 
 /* Character classes.  */
 typedef enum { RECC_ERROR = 0,