diff options
| author | Robert Pluim | 2018-12-14 15:04:14 +0100 |
|---|---|---|
| committer | Robert Pluim | 2018-12-14 15:05:20 +0100 |
| commit | f14d5742db39b797f742566c4e68dffa9a62646d (patch) | |
| tree | 9076714aeb8383f915d88a420427de063b4f0f44 /src | |
| parent | f519aa10b47f7c652ae9b5f021363073f5c463ff (diff) | |
| download | emacs-f14d5742db39b797f742566c4e68dffa9a62646d.tar.gz emacs-f14d5742db39b797f742566c4e68dffa9a62646d.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ftcrfont.c | 5 | ||||
| -rw-r--r-- | src/ftfont.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ftcrfont.c b/src/ftcrfont.c index 614ef083701..d19c300c5b0 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/>. */ | |||
| 35 | struct ftcrfont_info | 35 | struct ftcrfont_info |
| 36 | { | 36 | { |
| 37 | struct font font; | 37 | struct font font; |
| 38 | /* The following six members must be here in this order to be | 38 | /* The following members up to and including 'matrix' must be here |
| 39 | compatible with struct ftfont_info (in ftfont.c). */ | 39 | in this order to be compatible with struct ftfont_info (in |
| 40 | ftfont.c). */ | ||
| 40 | #ifdef HAVE_LIBOTF | 41 | #ifdef HAVE_LIBOTF |
| 41 | bool maybe_otf; /* Flag to tell if this may be OTF or not. */ | 42 | bool maybe_otf; /* Flag to tell if this may be OTF or not. */ |
| 42 | OTF *otf; | 43 | OTF *otf; |
diff --git a/src/ftfont.c b/src/ftfont.c index 8f048d2983b..a05aa12c2af 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -56,8 +56,9 @@ struct ftfont_info | |||
| 56 | { | 56 | { |
| 57 | struct font font; | 57 | struct font font; |
| 58 | #ifdef HAVE_LIBOTF | 58 | #ifdef HAVE_LIBOTF |
| 59 | /* The following four members must be here in this order to be | 59 | /* The following members up to and including 'matrix' must be here in |
| 60 | compatible with struct xftfont_info (in xftfont.c). */ | 60 | this order to be compatible with struct xftfont_info (in |
| 61 | xftfont.c). */ | ||
| 61 | bool maybe_otf; /* Flag to tell if this may be OTF or not. */ | 62 | bool maybe_otf; /* Flag to tell if this may be OTF or not. */ |
| 62 | OTF *otf; | 63 | OTF *otf; |
| 63 | #endif /* HAVE_LIBOTF */ | 64 | #endif /* HAVE_LIBOTF */ |