diff options
Diffstat (limited to 'xorg-server/composite')
| -rw-r--r-- | xorg-server/composite/compalloc.c | 2 | ||||
| -rw-r--r-- | xorg-server/composite/compoverlay.c | 4 | ||||
| -rw-r--r-- | xorg-server/composite/makefile | 9 |
3 files changed, 14 insertions, 1 deletions
diff --git a/xorg-server/composite/compalloc.c b/xorg-server/composite/compalloc.c index 3f427dbe1..560a1a24c 100644 --- a/xorg-server/composite/compalloc.c +++ b/xorg-server/composite/compalloc.c @@ -115,7 +115,7 @@ compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update) */ if (!cw) { - cw = xalloc (sizeof (CompWindowRec)); + cw = xcalloc (1,sizeof (CompWindowRec)); if (!cw) { xfree (ccw); diff --git a/xorg-server/composite/compoverlay.c b/xorg-server/composite/compoverlay.c index e213ce71e..edc1283b4 100644 --- a/xorg-server/composite/compoverlay.c +++ b/xorg-server/composite/compoverlay.c @@ -51,6 +51,10 @@ #include <dix-config.h> #endif +#ifdef CreateWindow +#undef CreateWindow +#endif + #include "compint.h" #include "xace.h" diff --git a/xorg-server/composite/makefile b/xorg-server/composite/makefile new file mode 100644 index 000000000..1ab95ebba --- /dev/null +++ b/xorg-server/composite/makefile @@ -0,0 +1,9 @@ +
+LIBRARY=libcomposite
+
+CSRCS = \
+ compalloc.c \
+ compext.c \
+ compinit.c \
+ compoverlay.c \
+ compwindow.c
|