mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-24 20:55:49 +00:00
Remove libcwrapper usage from xorg server modules. The libcwrapper is only
of (marginal) use in the drivers, and that usage remains.
This commit is contained in:
parent
a8cec1b656
commit
c3d1403672
193 changed files with 508 additions and 321 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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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) ||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -51,6 +51,8 @@ SOFTWARE.
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <X11/X.h>
|
||||
#include "windowstr.h"
|
||||
#include "pixmapstr.h"
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ SOFTWARE.
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <X11/X.h>
|
||||
|
||||
#include "gcstruct.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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -51,6 +51,8 @@ SOFTWARE.
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <X11/X.h>
|
||||
#include "scrnintstr.h"
|
||||
#include "windowstr.h"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue