aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2016-03-18 04:49:09 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-05-02 14:53:06 +0200
commit288136514239708fdd8c4d377dad134035d9b734 (patch)
tree66052d0d3c87490e78f968896087fb69050ae7e2 /nx-X11
parentd9e7f6ae42b30e32619e1d0979598c2ba2288a3e (diff)
downloadnx-libs-288136514239708fdd8c4d377dad134035d9b734.tar.gz
nx-libs-288136514239708fdd8c4d377dad134035d9b734.tar.bz2
nx-libs-288136514239708fdd8c4d377dad134035d9b734.zip
Move mi/miregion.c to dix/region.c
v1: Keith Packard <keithp@keithp.com> v2: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> (backported to nx-libs)
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/dix/Imakefile4
-rw-r--r--nx-X11/programs/Xserver/dix/region.c (renamed from nx-X11/programs/Xserver/mi/miregion.c)4
-rw-r--r--nx-X11/programs/Xserver/mi/Imakefile4
3 files changed, 7 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile
index 22b21eb95..20be46390 100644
--- a/nx-X11/programs/Xserver/dix/Imakefile
+++ b/nx-X11/programs/Xserver/dix/Imakefile
@@ -17,11 +17,11 @@ FFS_OBJ = ffs.o
SRCS = atom.c colormap.c cursor.c devices.c dispatch.c dixutils.c events.c \
extension.c gc.c globals.c glyphcurs.c grabs.c \
- main.c property.c resource.c swaprep.c swapreq.c \
+ main.c property.c region.c resource.c swaprep.c swapreq.c \
tables.c window.c initatoms.c dixfonts.c privates.c pixmap.c $(FFS_SRC)
OBJS = atom.o colormap.o cursor.o devices.o dispatch.o dixutils.o events.o \
extension.o gc.o globals.o glyphcurs.o grabs.o \
- main.o property.o resource.o swaprep.o swapreq.o \
+ main.o property.o region.o resource.o swaprep.o swapreq.o \
tables.o window.o initatoms.o dixfonts.o privates.o pixmap.o $(FFS_OBJ)
INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
diff --git a/nx-X11/programs/Xserver/mi/miregion.c b/nx-X11/programs/Xserver/dix/region.c
index b8216e1bb..410772ff8 100644
--- a/nx-X11/programs/Xserver/mi/miregion.c
+++ b/nx-X11/programs/Xserver/dix/region.c
@@ -81,6 +81,8 @@ Equipment Corporation.
#include <dix-config.h>
#endif
+#include <pixman.h>
+
#include "regionstr.h"
#include <nx-X11/Xprotostr.h>
#include "gc.h"
@@ -219,7 +221,7 @@ if (((numRects) < ((reg)->data->size >> 1)) && ((reg)->data->size > 50)) \
}
-BoxRec miEmptyBox = {0, 0, 0, 0};
+pixman_box16_t miEmptyBox = {0, 0, 0, 0};
RegDataRec miEmptyData = {0, 0};
RegDataRec miBrokenData = {0, 0};
diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile
index 290f85790..4f87dec8e 100644
--- a/nx-X11/programs/Xserver/mi/Imakefile
+++ b/nx-X11/programs/Xserver/mi/Imakefile
@@ -44,7 +44,7 @@ SRCS = $(CBRT_SRC) mivaltree.c mipolyseg.c mipolyrect.c \
mipoly.c mipolycon.c mipolygen.c mipolyutil.c \
mifillrct.c miwideline.c mispans.c \
miarc.c mizerarc.c mifillarc.c \
- miwindow.c micursor.c miregion.c \
+ miwindow.c micursor.c \
mipolytext.c mibitblt.c mipolypnt.c mipushpxl.c \
miexpose.c miglblt.c mizerline.c mizerclip.c mifpolycon.c \
midash.c mibstore.c mibank.c $(MIINITEXTSRC) mieq.c \
@@ -55,7 +55,7 @@ OBJS = $(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \
mipoly.o mipolycon.o mipolygen.o mipolyutil.o \
mifillrct.o miwideline.o mispans.o \
miarc.o mizerarc.o mifillarc.o \
- miwindow.o micursor.o miregion.o \
+ miwindow.o micursor.o \
mipolytext.o mibitblt.o mipolypnt.o mipushpxl.o \
miexpose.o miglblt.o mizerline.o mizerclip.o mifpolycon.o \
midash.o mibstore.o mibank.o $(MIINITEXTOBJ) mieq.o \