diff options
Diffstat (limited to 'cfb')
| -rw-r--r-- | cfb/cfb.h | 6 | ||||
| -rw-r--r-- | cfb/cfb8line.c | 1 | ||||
| -rw-r--r-- | cfb/cfbbitblt.c | 2 | ||||
| -rw-r--r-- | cfb/cfbblt.c | 2 | ||||
| -rw-r--r-- | cfb/cfbcppl.c | 1 | ||||
| -rw-r--r-- | cfb/cfbfillarc.c | 4 | ||||
| -rw-r--r-- | cfb/cfbgc.c | 2 | ||||
| -rw-r--r-- | cfb/cfbimage.c | 2 | ||||
| -rw-r--r-- | cfb/cfbline.c | 1 | ||||
| -rw-r--r-- | cfb/cfbmskbits.h | 1 | ||||
| -rw-r--r-- | cfb/cfbpixmap.c | 2 | ||||
| -rw-r--r-- | cfb/cfbply1rct.c | 2 | ||||
| -rw-r--r-- | cfb/cfbwindow.c | 2 | ||||
| -rw-r--r-- | cfb/cfbzerarc.c | 4 |
14 files changed, 23 insertions, 9 deletions
@@ -1316,12 +1316,6 @@ extern int cfbScreenPrivateIndex; #include "micoord.h" -/* - * if CFB is built as a module, it shouldn't call libc functions. - */ -#ifdef XFree86LOADER -#include "xf86_ansic.h" -#endif #endif /* !CFB_PROTOTYPES_ONLY */ #endif diff --git a/cfb/cfb8line.c b/cfb/cfb8line.c index 0f27f1d47..9740c2139 100644 --- a/cfb/cfb8line.c +++ b/cfb/cfb8line.c @@ -33,6 +33,7 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif +#include <stdlib.h> #include <X11/X.h> #include "gcstruct.h" diff --git a/cfb/cfbbitblt.c b/cfb/cfbbitblt.c index a9dd438fe..2e621337a 100644 --- a/cfb/cfbbitblt.c +++ b/cfb/cfbbitblt.c @@ -37,6 +37,8 @@ Author: Keith Packard #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/cfb/cfbblt.c b/cfb/cfbblt.c index 7a0b192cc..db32c87e5 100644 --- a/cfb/cfbblt.c +++ b/cfb/cfbblt.c @@ -38,6 +38,8 @@ Author: Keith Packard #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c index 037a516f2..f58682056 100644 --- a/cfb/cfbcppl.c +++ b/cfb/cfbcppl.c @@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif +#include <string.h> #include <X11/X.h> #include <X11/Xmd.h> #include "gcstruct.h" diff --git a/cfb/cfbfillarc.c b/cfb/cfbfillarc.c index 6fb6bb728..797e9ea78 100644 --- a/cfb/cfbfillarc.c +++ b/cfb/cfbfillarc.c @@ -31,6 +31,8 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif +#include <sys/limits.h> + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" @@ -358,7 +360,7 @@ RROP_NAME(cfbPolyFillArcSolid) (pDraw, pGC, narcs, parcs) box.x2 = x2; y2 = box.y1 + (int)arc->height + 1; box.y2 = y2; - if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) && + if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) && (RECT_IN_REGION(pDraw->pScreen, cclip, &box) == rgnIN) ) { if ((arc->angle2 >= FULLCIRCLE) || diff --git a/cfb/cfbgc.c b/cfb/cfbgc.c index 9cf53d35b..248b2042a 100644 --- a/cfb/cfbgc.c +++ b/cfb/cfbgc.c @@ -52,6 +52,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/cfb/cfbimage.c b/cfb/cfbimage.c index ce3909e63..f8c298922 100644 --- a/cfb/cfbimage.c +++ b/cfb/cfbimage.c @@ -51,6 +51,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <string.h> + #include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" diff --git a/cfb/cfbline.c b/cfb/cfbline.c index 392fe483e..c70c48a51 100644 --- a/cfb/cfbline.c +++ b/cfb/cfbline.c @@ -50,6 +50,7 @@ SOFTWARE. #include <dix-config.h> #endif +#include <stdlib.h> #include <X11/X.h> #include "gcstruct.h" diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h index a803cac72..f9ce33a61 100644 --- a/cfb/cfbmskbits.h +++ b/cfb/cfbmskbits.h @@ -36,7 +36,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "servermd.h" #if defined(XFREE86) || ( defined(__OpenBSD__) && defined(__alpha__) ) \ || (defined(__bsdi__)) -#include "xf86_ansic.h" #include "compiler.h" #endif diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c index 704ab4eda..e73cf5735 100644 --- a/cfb/cfbpixmap.c +++ b/cfb/cfbpixmap.c @@ -52,6 +52,8 @@ SOFTWARE. on a monchrome device, a pixmap is a bitmap. */ +#include <string.h> + #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif diff --git a/cfb/cfbply1rct.c b/cfb/cfbply1rct.c index 99a2379c9..b431f33e1 100644 --- a/cfb/cfbply1rct.c +++ b/cfb/cfbply1rct.c @@ -31,6 +31,8 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "gcstruct.h" diff --git a/cfb/cfbwindow.c b/cfb/cfbwindow.c index 7160f5436..ebc1c4593 100644 --- a/cfb/cfbwindow.c +++ b/cfb/cfbwindow.c @@ -51,6 +51,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/cfb/cfbzerarc.c b/cfb/cfbzerarc.c index a9e0b2f9d..0d88bfd5a 100644 --- a/cfb/cfbzerarc.c +++ b/cfb/cfbzerarc.c @@ -37,6 +37,8 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif +#include <sys/limits.h> + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" @@ -308,7 +310,7 @@ RROP_NAME (cfbZeroPolyArcSS8) (pDraw, pGC, narcs, parcs) box.x2 = x2; y2 = box.y1 + (int)arc->height + 1; box.y2 = y2; - if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) && + if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) && (RECT_IN_REGION(pDraw->pScreen, cclip, &box) == rgnIN) ) RROP_NAME (cfbZeroArcSS8) (pDraw, pGC, arc); else |