[Emacs-diffs] emacs-26 f14d574: Document font structure layout constraints

[Robert Pluim]

branch: emacs-26
commit f14d5742db39b797f742566c4e68dffa9a62646d
Author: Robert Pluim <address@hidden>
Commit: Robert Pluim <address@hidden>

    Document font structure layout constraints
    
    The layout of the initial members of ftcrfont_info must match
    ftfont_info
    
    * src/ftcrfont.c (struct ftcrfont_info): Likewise.
    
    * src/ftfont.c (struct ftfont_info): Document layout constraints.
---
 src/ftcrfont.c | 5 +++--
 src/ftfont.c   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index 614ef08..d19c300 100644
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -35,8 +35,9 @@ along with GNU Emacs.  If not, see 
<https://www.gnu.org/licenses/>.  */
 struct ftcrfont_info
 {
   struct font font;
-  /* The following six members must be here in this order to be
-     compatible with struct ftfont_info (in ftfont.c).  */
+  /* The following members up to and including 'matrix' must be here
+     in this order to be compatible with struct ftfont_info (in
+     ftfont.c).  */
 #ifdef HAVE_LIBOTF
   bool maybe_otf;        /* Flag to tell if this may be OTF or not.  */
   OTF *otf;
diff --git a/src/ftfont.c b/src/ftfont.c
index 8f048d2..a05aa12 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -56,8 +56,9 @@ struct ftfont_info
 {
   struct font font;
 #ifdef HAVE_LIBOTF
-  /* The following four members must be here in this order to be
-     compatible with struct xftfont_info (in xftfont.c).  */
+  /* The following members up to and including 'matrix' must be here in
+     this order to be compatible with struct xftfont_info (in
+     xftfont.c).  */
   bool maybe_otf;      /* Flag to tell if this may be OTF or not.  */
   OTF *otf;
 #endif /* HAVE_LIBOTF */