diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:22 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:22 +0000 |
| commit | 1e3c49984c5426ecdfd1d9212aa4fd26924af847 (patch) | |
| tree | f93a8029fa3fd3e0cbe0daae24f283643f0a2e89 | |
| parent | f1b010ee7ae89b23af8fe4c92103db775ae35aed (diff) | |
merge XFree86 RC2 (4.3.99.902) from vendor branchXEVIE-BASE
| -rw-r--r-- | src/encparse.c | 7 | ||||
| -rw-r--r-- | src/fontenc.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/encparse.c b/src/encparse.c index 4c9c31b..e4c9a7e 100644 --- a/src/encparse.c +++ b/src/encparse.c @@ -20,7 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/fontfile/encparse.c,v 1.18 2001/11/02 03:06:40 dawes Exp $ */ +/* $XdotOrg: xc/lib/font/fontfile/encparse.c,v 1.19 2003/12/19 02:05:38 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/encparse.c,v 1.19 2003/12/19 02:05:38 dawes Exp $ */ /* Parser for encoding files */ @@ -32,6 +33,10 @@ THE SOFTWARE. #include <string.h> #include <stdio.h> +#ifdef SCO325 +#include <strings.h> +#endif + #ifndef FONTENC_NO_LIBFONT #include "fntfilio.h" diff --git a/src/fontenc.c b/src/fontenc.c index 247cc0a..0bf69e2 100644 --- a/src/fontenc.c +++ b/src/fontenc.c @@ -20,12 +20,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/fontfile/fontenc.c,v 1.15 2003/02/20 03:25:19 dawes Exp $ */ +/* $XdotOrg: xc/lib/font/fontfile/fontenc.c,v 1.16 2003/12/19 02:05:38 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontenc.c,v 1.16 2003/12/19 02:05:38 dawes Exp $ */ /* Backend-independent encoding code */ #include <string.h> +#ifdef SCO325 +#include <strings.h> +#endif + #ifndef FONTENC_NO_LIBFONT #include "fontmisc.h" /* defines xalloc and friends */ |