--- a/src/SDL_Pango.h
+++ b/src/SDL_Pango.h
@@ -171,7 +171,7 @@
     SDLPango_Direction direction);
 
 
-#ifdef __FT2_BUILD_UNIX_H__
+#ifdef FT2BUILD_H_
 
 extern DECLSPEC void SDLCALL SDLPango_CopyFTBitmapToSurface(
     const FT_Bitmap *bitmap,
@@ -179,7 +179,7 @@
     const SDLPango_Matrix *matrix,
     SDL_Rect *rect);
 
-#endif	/* __FT2_BUILD_UNIX_H__ */
+#endif
 
 
 #ifdef __PANGO_H__
git.koszko.org/cgit-static/cgit.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/'>index</a> : <a href='/guix/'>guix</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='c552a7e7372f256196a7a982fed8fba6e81c11d4'/><select name='h' onchange='this.form.submit();'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=c552a7e7372f256196a7a982fed8fba6e81c11d4'>refs</a><a class='active' href='/guix/log/gnu/tests/data'>log</a><a href='/guix/tree/gnu/tests/data?id=c552a7e7372f256196a7a982fed8fba6e81c11d4'>tree</a><a href='/guix/commit/gnu/tests/data?id=c552a7e7372f256196a7a982fed8fba6e81c11d4'>commit</a><a href='/guix/diff/gnu/tests/data?id=c552a7e7372f256196a7a982fed8fba6e81c11d4'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests/data'>
<input type='hidden' name='id' value='c552a7e7372f256196a7a982fed8fba6e81c11d4'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=c552a7e7372f256196a7a982fed8fba6e81c11d4'>root</a>/<a href='/guix/log/gnu?id=c552a7e7372f256196a7a982fed8fba6e81c11d4'>gnu</a>/<a href='/guix/log/gnu/tests?id=c552a7e7372f256196a7a982fed8fba6e81c11d4'>tests</a>/<a href='/guix/log/gnu/tests/data?id=c552a7e7372f256196a7a982fed8fba6e81c11d4'>data</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/tests/data?id=c552a7e7372f256196a7a982fed8fba6e81c11d4&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-08-02 17:23:30 -0400'>2021-08-02</span></td><td><a href='/guix/commit/gnu/tests/data?id=10f554700c417b84c22c56fdd007567a52c45d75'>Reinstate "services: Add a service for Jami."</a><span class='msg-avail'>...<span class='msg-tooltip'>This reverts commit 4673f817938d9d2b1b40a072ab2e0c44a32ccc97, which reverted
commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b with the fix detailed below.

Thanks to Christopher Baines for reporting the failure and proposing a fix.

* guix/self.scm (compiled-guix) [*system-test-modules*]: Add the test data
files via the 'extra-files' argument.
* gnu/local.mk (dist_patch_DATA): Move the tests/data/jami-dummy-account.dat
file to...
* gnu/local.mk (MODULES_NOT_COMPILED): ... here.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-08-02 15:48:59 -0400'>2021-08-02</span></td><td><a href='/guix/commit/gnu/tests/data?id=4673f817938d9d2b1b40a072ab2e0c44a32ccc97'>Revert "services: Add a service for Jami."</a><span class='msg-avail'>...<span class='msg-tooltip'>This reverts commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b.  It broke 'guix
pull'.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-08-02 15:15:02 -0400'>2021-08-02</span></td><td><a href='/guix/commit/gnu/tests/data?id=69dcc24c9f0cdfea674eb690e7755d26a25ced2b'>services: Add a service for Jami.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/telephony.scm (string-or-computed-file?)
(string-list?, account-fingerprint-list?): New procedures.
(maybe-string-list, maybe-account-fingerprint-list)
(maybe-boolean, maybe-string, jami-account-list): New configuration field
types.
(serialize-string-list, serialize-boolean, serialize-string)
(jami-account, jami-account-&gt;alist, jami-configuration)
(jami-account-list?, jami-account-list-maybe): New procedures.
(%jami-accounts): New variable.
(jami-configuration-&gt;command-line-arguments): New procedure.
(jami-dbus-session-activation, jami-shepherd-services): New procedures.
(jami-service-type): New variable.
* gnu/build/jami-service.scm: New file.
* gnu/tests/data/jami-dummy-account.dat: Likewise.
* gnu/tests/telephony.scm: Likewise.
* gnu/local.mk (GNU_SYSTEM_MODULES): Register them.
* Makefile.am (SCM_TESTS): Register the test file.
(dist_patch_DATA): Register the new data file.
* doc/guix.texi (Telephony Services): Document it.
</span></span></td><td>Maxim Cournoyer</td></tr>