frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let code build with gcc 2.95

This commit is contained in:
Matthieu Herrb 2008-06-19 16:51:18 +02:00 committed by Matthieu Herrb
parent 219dd2d44a
commit c0d7ad9c88
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xfree86/common/xf86Config.c
View File

@ -599,8 +599,9 @@ configFiles(XF86ConfFilesPtr fileconf)
pathFrom = X_CONFIG; pathFrom = X_CONFIG;
if (*f) { if (*f) {
if (xf86Info.useDefaultFontPath) { if (xf86Info.useDefaultFontPath) {
char *g;
xf86Msg(X_DEFAULT, "Including the default font path %s.\n", defaultFontPath); xf86Msg(X_DEFAULT, "Including the default font path %s.\n", defaultFontPath);
char *g = xnfalloc(strlen(defaultFontPath) + strlen(f) + 3); g = xnfalloc(strlen(defaultFontPath) + strlen(f) + 3);
strcpy(g, f); strcpy(g, f);
strcat(g, ","); strcat(g, ",");
defaultFontPath = strcat(g, defaultFontPath); defaultFontPath = strcat(g, defaultFontPath);
@ -1233,8 +1234,8 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
* remove the core attribute from the later ones. * remove the core attribute from the later ones.
*/ */
for (devs = servlayoutp->inputs; devs && *devs; devs++) { for (devs = servlayoutp->inputs; devs && *devs; devs++) {
indp = *devs;
pointer opt1 = NULL, opt2 = NULL; pointer opt1 = NULL, opt2 = NULL;
indp = *devs;
if (indp->commonOptions && if (indp->commonOptions &&
xf86CheckBoolOption(indp->commonOptions, "CorePointer", FALSE)) { xf86CheckBoolOption(indp->commonOptions, "CorePointer", FALSE)) {
opt1 = indp->commonOptions; opt1 = indp->commonOptions;

16
hw/xfree86/modes/xf86Rotate.c
View File

@ -597,6 +597,10 @@ xf86CrtcRotate (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation)
} }
else else
{ {
int width, height, old_width, old_height;
void *shadowData;
PixmapPtr shadow;
PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, F(crtc->x), F(crtc->y)); PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, F(crtc->x), F(crtc->y));
PictureTransformIsInverse ("offset", &crtc_to_fb, &fb_to_crtc); PictureTransformIsInverse ("offset", &crtc_to_fb, &fb_to_crtc);
@ -605,12 +609,12 @@ xf86CrtcRotate (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation)
* matches the mode, not the pre-rotated copy in the * matches the mode, not the pre-rotated copy in the
* frame buffer * frame buffer
*/ */
int width = mode->HDisplay; width = mode->HDisplay;
int height = mode->VDisplay; height = mode->VDisplay;
void *shadowData = crtc->rotatedData; shadowData = crtc->rotatedData;
PixmapPtr shadow = crtc->rotatedPixmap; shadow = crtc->rotatedPixmap;
int old_width = shadow ? shadow->drawable.width : 0; old_width = shadow ? shadow->drawable.width : 0;
int old_height = shadow ? shadow->drawable.height : 0; old_height = shadow ? shadow->drawable.height : 0;
/* Allocate memory for rotation */ /* Allocate memory for rotation */
if (old_width != width || old_height != height) if (old_width != width || old_height != height)