X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/35e1f9d9fcbaab51808e05f514e63927f959ae51..e686f4760ca8e4fe3fb414cfeac0948e0f99a4ec:/src/regex.h

diff --git a/src/regex.h b/src/regex.h
index 0e25723a85..817167a07c 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -1,7 +1,7 @@
 /* Definitions for data structures and routines for the regular
    expression library, version 0.12.
 
-   Copyright (C) 1985, 1989-1993, 1995, 2000-2014 Free Software
+   Copyright (C) 1985, 1989-1993, 1995, 2000-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -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,