Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[gnu-emacs] / src / regex.h

diff --git a/src/regex.h b/src/regex.h
index 0e25723a85ecabf6516e131b85a804b463f27897..c89ca46d4bd1742e3b9f1d5f5af463c9dd231831 100644 (file)
--- 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-2015 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -603,7 +603,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,