diff options
| author | Keith Packard <keithp@keithp.com> | 2015-09-02 00:04:32 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-12-08 20:37:48 -0800 |
| commit | 135fb032e940ce226c9feb13e6e903f3ecbc5eb0 (patch) | |
| tree | b6cea9b925c7be27a13964924b7811823f52f2e2 /src/FreeType | |
| parent | eb67d10ae82b364a4324e96ce53baaa4e5e75f97 (diff) | |
| download | xorg-lib-libXfont-135fb032e940ce226c9feb13e6e903f3ecbc5eb0.tar.gz | |
Eliminate calls back to X server or font server functions by name (v4)libXfont2-2.0.0
This eliminates the weak symbol adventures and makes all of the calls
back to the X server or Font server go through a table of functions
instead, clarifying the required API.
As this is a rather major change to the API for the library, it now
installs itself as libXfont2 instead of libXfont, and the package
config file is now xfont2.pc.
All of the installed headers remain the same as the original library;
there's now a new include file, libxfont2.h, which defines the X
server and Font server interfaces.
This moves util/atom.c to stubs/atom.c and reformats that file, hence
the diff being larger than it would otherwise be.
v2: Rename to libXfont2 instead of libXfont_2 as suggested by Emil Velikov
Fix whitespace in stubs/atom.c, which was moved from util/
v3: Remove select masks from API. Expose single 'font_init' function
for all library initialization.
v4: Change name of distributed tarballs to libXfont2 as well
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/FreeType')
| -rw-r--r-- | src/FreeType/ft.h | 2 | ||||
| -rw-r--r-- | src/FreeType/ftenc.c | 1 | ||||
| -rw-r--r-- | src/FreeType/ftfuncs.c | 1 | ||||
| -rw-r--r-- | src/FreeType/fttools.c | 1 | ||||
| -rw-r--r-- | src/FreeType/xttcap.c | 1 |
5 files changed, 4 insertions, 2 deletions
diff --git a/src/FreeType/ft.h b/src/FreeType/ft.h index 8cf31d4..7fa86b0 100644 --- a/src/FreeType/ft.h +++ b/src/FreeType/ft.h @@ -82,6 +82,4 @@ unsigned FTRemap(FT_Face face, FTMappingPtr, unsigned code); int FTtoXReturnCode(int); int FTGetEnglishName(FT_Face, int, char *, int); -extern void ErrorF(const char*, ...); - #endif /* _FT_H_ */ diff --git a/src/FreeType/ftenc.c b/src/FreeType/ftenc.c index 9e31d75..dfa5cab 100644 --- a/src/FreeType/ftenc.c +++ b/src/FreeType/ftenc.c @@ -23,6 +23,7 @@ THE SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include "libxfontint.h" #include <string.h> #include <X11/fonts/fntfilst.h> diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c index df64f5e..bbd4db4 100644 --- a/src/FreeType/ftfuncs.c +++ b/src/FreeType/ftfuncs.c @@ -29,6 +29,7 @@ THE SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include "libxfontint.h" #include <X11/fonts/fontmisc.h> #include <string.h> diff --git a/src/FreeType/fttools.c b/src/FreeType/fttools.c index 8c5d08e..7c0bd9b 100644 --- a/src/FreeType/fttools.c +++ b/src/FreeType/fttools.c @@ -24,6 +24,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include "libxfontint.h" #include <X11/fonts/fontmisc.h> #include <ctype.h> #include <string.h> diff --git a/src/FreeType/xttcap.c b/src/FreeType/xttcap.c index e30e0f9..f54f76c 100644 --- a/src/FreeType/xttcap.c +++ b/src/FreeType/xttcap.c @@ -41,6 +41,7 @@ static char const * const releaseID = #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include "libxfontint.h" #include <X11/fonts/fontmisc.h> #include <string.h> #include <ctype.h> |