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 cc69c68f2..e684c4360 100644 --- a/xorg-server/composite/compalloc.c +++ b/xorg-server/composite/compalloc.c @@ -169,7 +169,7 @@ compRedirectWindow(ClientPtr pClient, WindowPtr pWin, int update) * Now make sure there's a per-window structure to hang this from */ if (!cw) { - cw = malloc(sizeof(CompWindowRec)); + cw = calloc(1,sizeof(CompWindowRec)); if (!cw) { free(ccw); return BadAlloc; diff --git a/xorg-server/composite/compoverlay.c b/xorg-server/composite/compoverlay.c index d3cfaf06f..3eafc2031 100644 --- a/xorg-server/composite/compoverlay.c +++ b/xorg-server/composite/compoverlay.c @@ -45,6 +45,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
|