From: Daniel Colascione <dancol@dancol.org>
Date: Sat, 16 Jun 2018 06:48:26 +0000 (-0700)
Subject: Tweak field ordering in re_pattern_buffer
X-Git-Tag: emacs-27.0.90~4830
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=55bc3db67c6a691bf40036394cd8ed4ab0a31c08;p=emacs.git

Tweak field ordering in re_pattern_buffer

* src/regex.h (struct re_pattern_buffer): Reorder charset_unibyte
field to keep bitfields together.
---

diff --git a/src/regex.h b/src/regex.h
index 6974951f575..082f7e010d8 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -367,7 +367,10 @@ struct re_pattern_buffer
 	/* Number of bytes actually used in `buffer'.  */
   size_t used;
 
-#ifndef emacs
+#ifdef emacs
+        /* Charset of unibyte characters at compiling time. */
+  int charset_unibyte;
+#else
         /* Syntax setting with which the pattern was compiled.  */
   reg_syntax_t syntax;
 #endif
@@ -427,9 +430,6 @@ struct re_pattern_buffer
   /* If true, multi-byte form in the target of match should be
      recognized as a multibyte character.  */
   unsigned target_multibyte : 1;
-
-  /* Charset of unibyte characters at compiling time. */
-  int charset_unibyte;
 #endif
 
 /* [[[end pattern_buffer]]] */