aboutsummaryrefslogtreecommitdiff
path: root/libfontenc/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-11-14 09:42:43 +0100
committermarha <marha@users.sourceforge.net>2011-11-14 09:42:43 +0100
commit93795f7d8ca73dd428a926901cbc632015ac0cf5 (patch)
tree3fdcae64c6a51d6512aa32387846a2f282439855 /libfontenc/src
parent00ea126522f5bbf5c4600ddb93a45b260475c8c1 (diff)
parent156e37d3879b316329e3e05579414031da2647e2 (diff)
downloadvcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.tar.gz
vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.tar.bz2
vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.zip
Merge remote-tracking branch 'origin/released'
Conflicts: libX11/src/util/makekeys.c
Diffstat (limited to 'libfontenc/src')
-rw-r--r--libfontenc/src/encparse.c5
-rw-r--r--libfontenc/src/fontenc.c4
2 files changed, 1 insertions, 8 deletions
diff --git a/libfontenc/src/encparse.c b/libfontenc/src/encparse.c
index 23a6dd673..7b8a2d5e2 100644
--- a/libfontenc/src/encparse.c
+++ b/libfontenc/src/encparse.c
@@ -28,11 +28,8 @@ THE SOFTWARE.
to be pure ASCII. Bloody ``Code Set Independence''. */
#include <string.h>
-#include <stdio.h>
-
-#if defined(__SCO__) || defined(__UNIXWARE__)
#include <strings.h>
-#endif
+#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/libfontenc/src/fontenc.c b/libfontenc/src/fontenc.c
index 1f6f5f302..bcfa3ac23 100644
--- a/libfontenc/src/fontenc.c
+++ b/libfontenc/src/fontenc.c
@@ -23,11 +23,7 @@ THE SOFTWARE.
/* Backend-independent encoding code */
#include <string.h>
-
-#if defined(__SCO__) || defined(__UNIXWARE__)
#include <strings.h>
-#endif
-
#include <stdlib.h>
#include <unistd.h>