aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/fb
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-12-04 21:14:24 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-12-04 21:14:24 +0100
commitb38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9 (patch)
treeee0d60bb4a9c500f6072891a7802fd06be15ce8a /nx-X11/programs/Xserver/fb
parent62f8e50e7a5ddc6952a951edc37ee53c2a828675 (diff)
parent508d2deae98846111299a3693033a507010e3c91 (diff)
downloadnx-libs-b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9.tar.gz
nx-libs-b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9.tar.bz2
nx-libs-b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9.zip
Merge branch 'sunweaver-pr/extmod-xfree86loader-cleanup' into 3.6.x
Attributes GH PR #251: https://github.com/ArcticaProject/nx-libs/pull/251
Diffstat (limited to 'nx-X11/programs/Xserver/fb')
-rw-r--r--nx-X11/programs/Xserver/fb/fb24_32.c6
-rw-r--r--nx-X11/programs/Xserver/fb/fbarc.c6
-rw-r--r--nx-X11/programs/Xserver/fb/fbcompose.c6
-rw-r--r--nx-X11/programs/Xserver/fb/fbcopy.c5
-rw-r--r--nx-X11/programs/Xserver/fb/fbgc.c5
-rw-r--r--nx-X11/programs/Xserver/fb/fbimage.c7
-rw-r--r--nx-X11/programs/Xserver/fb/fboverlay.c3
-rw-r--r--nx-X11/programs/Xserver/fb/fbpict.c2
-rw-r--r--nx-X11/programs/Xserver/fb/fbpixmap.c5
-rw-r--r--nx-X11/programs/Xserver/fb/fbseg.c2
-rw-r--r--nx-X11/programs/Xserver/fb/fbwindow.c5
11 files changed, 24 insertions, 28 deletions
diff --git a/nx-X11/programs/Xserver/fb/fb24_32.c b/nx-X11/programs/Xserver/fb/fb24_32.c
index 5dc34d7f5..13af3acb2 100644
--- a/nx-X11/programs/Xserver/fb/fb24_32.c
+++ b/nx-X11/programs/Xserver/fb/fb24_32.c
@@ -27,11 +27,7 @@
#include <dix-config.h>
#endif
-#ifdef XFree86LOADER
-#include "xf86.h"
-#include "xf86_ansic.h"
-#endif
-
+#include <string.h>
#include "fb.h"
/* X apps don't like 24bpp images, this code exposes 32bpp images */
diff --git a/nx-X11/programs/Xserver/fb/fbarc.c b/nx-X11/programs/Xserver/fb/fbarc.c
index 0193d2b31..ae89e44d8 100644
--- a/nx-X11/programs/Xserver/fb/fbarc.c
+++ b/nx-X11/programs/Xserver/fb/fbarc.c
@@ -28,9 +28,7 @@
#include "fb.h"
#include "mizerarc.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
+#include <limits.h>
typedef void (*FbArc) (FbBits *dst,
FbStride dstStride,
@@ -99,7 +97,7 @@ fbPolyArc (DrawablePtr pDrawable,
box.x2 = x2;
y2 = box.y1 + (int)parcs->height + 1;
box.y2 = y2;
- if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) &&
+ if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) &&
(RegionContainsRect(cclip, &box) == rgnIN) )
(*arc) (dst, dstStride, dstBpp,
parcs, pDrawable->x + dstXoff, pDrawable->y + dstYoff,
diff --git a/nx-X11/programs/Xserver/fb/fbcompose.c b/nx-X11/programs/Xserver/fb/fbcompose.c
index 07ae9490f..b0b256e47 100644
--- a/nx-X11/programs/Xserver/fb/fbcompose.c
+++ b/nx-X11/programs/Xserver/fb/fbcompose.c
@@ -33,10 +33,14 @@
#ifdef RENDER
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <assert.h>
+
#include "picturestr.h"
#include "mipict.h"
#include "fbpict.h"
-#include <math.h>
#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
diff --git a/nx-X11/programs/Xserver/fb/fbcopy.c b/nx-X11/programs/Xserver/fb/fbcopy.c
index 39c75afc5..a0a67950b 100644
--- a/nx-X11/programs/Xserver/fb/fbcopy.c
+++ b/nx-X11/programs/Xserver/fb/fbcopy.c
@@ -26,10 +26,9 @@
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
void
fbCopyNtoN (DrawablePtr pSrcDrawable,
diff --git a/nx-X11/programs/Xserver/fb/fbgc.c b/nx-X11/programs/Xserver/fb/fbgc.c
index fd7636937..437bc5df3 100644
--- a/nx-X11/programs/Xserver/fb/fbgc.c
+++ b/nx-X11/programs/Xserver/fb/fbgc.c
@@ -26,10 +26,9 @@
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
const GCFuncs fbGCFuncs = {
fbValidateGC,
diff --git a/nx-X11/programs/Xserver/fb/fbimage.c b/nx-X11/programs/Xserver/fb/fbimage.c
index c3b0fe3fb..9894faf02 100644
--- a/nx-X11/programs/Xserver/fb/fbimage.c
+++ b/nx-X11/programs/Xserver/fb/fbimage.c
@@ -26,12 +26,9 @@
#include <dix-config.h>
#endif
-#include "fb.h"
-#ifdef XFree86LOADER
-#include "xf86.h"
-#include "xf86_ansic.h"
-#endif
+#include <string.h>
+#include "fb.h"
void
fbPutImage (DrawablePtr pDrawable,
diff --git a/nx-X11/programs/Xserver/fb/fboverlay.c b/nx-X11/programs/Xserver/fb/fboverlay.c
index ac0875016..71a7f30d2 100644
--- a/nx-X11/programs/Xserver/fb/fboverlay.c
+++ b/nx-X11/programs/Xserver/fb/fboverlay.c
@@ -23,11 +23,12 @@
* Author: Keith Packard, SuSE, Inc.
*/
-
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include "fb.h"
#include "fboverlay.h"
diff --git a/nx-X11/programs/Xserver/fb/fbpict.c b/nx-X11/programs/Xserver/fb/fbpict.c
index 32b395808..c513b3621 100644
--- a/nx-X11/programs/Xserver/fb/fbpict.c
+++ b/nx-X11/programs/Xserver/fb/fbpict.c
@@ -27,6 +27,8 @@
#include <dix-config.h>
#endif
+#include <string.h>
+
#include "fb.h"
#ifdef RENDER
diff --git a/nx-X11/programs/Xserver/fb/fbpixmap.c b/nx-X11/programs/Xserver/fb/fbpixmap.c
index 599f3b44e..a2b98bc3c 100644
--- a/nx-X11/programs/Xserver/fb/fbpixmap.c
+++ b/nx-X11/programs/Xserver/fb/fbpixmap.c
@@ -26,10 +26,9 @@
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
PixmapPtr
fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp)
diff --git a/nx-X11/programs/Xserver/fb/fbseg.c b/nx-X11/programs/Xserver/fb/fbseg.c
index 8c50829c5..db3240e1b 100644
--- a/nx-X11/programs/Xserver/fb/fbseg.c
+++ b/nx-X11/programs/Xserver/fb/fbseg.c
@@ -26,6 +26,8 @@
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include "fb.h"
#include "miline.h"
diff --git a/nx-X11/programs/Xserver/fb/fbwindow.c b/nx-X11/programs/Xserver/fb/fbwindow.c
index aca49e5b1..c4e28de5b 100644
--- a/nx-X11/programs/Xserver/fb/fbwindow.c
+++ b/nx-X11/programs/Xserver/fb/fbwindow.c
@@ -26,10 +26,9 @@
#include <dix-config.h>
#endif
+#include <stdlib.h>
+
#include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
Bool
fbCreateWindow(WindowPtr pWin)