diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-15 11:15:22 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-15 11:15:22 +0100 |
| commit | 4cca1b4bd38e275f3c95bbfe526b229b3a7b8397 (patch) | |
| tree | 71de2b87c432677084373d8a7dad0d963151dda0 /nx-X11/programs/Xserver/hw/nxagent/compext/Bitmap.c | |
| parent | 8cca3f09d85a4eaab2df1d671a0f57972b1c167d (diff) | |
| parent | 5597f2ea509d14fd5589399011c1b8b728901a83 (diff) | |
| download | nx-libs-4cca1b4bd38e275f3c95bbfe526b229b3a7b8397.tar.gz nx-libs-4cca1b4bd38e275f3c95bbfe526b229b3a7b8397.tar.bz2 nx-libs-4cca1b4bd38e275f3c95bbfe526b229b3a7b8397.zip | |
Merge branch 'sunweaver-pr/more-X-memory-macro-fixes' into 3.6.x
Attributes GH PR #605: https://github.com/ArcticaProject/nx-libs/pull/605
Reviewed-by: Ulrich Sibiller <uli42@gmx.de> -- Thu, 14 Dec 2017 13:15:12 +0000
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/compext/Bitmap.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/compext/Bitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Bitmap.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Bitmap.c index d906118d0..c60c09d23 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/compext/Bitmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Bitmap.c @@ -73,7 +73,7 @@ char *BitmapCompressData(XImage *image, unsigned int *size) *size = image -> width * image -> height * 3; - data = Xmalloc(*size); + data = malloc(*size); if (data == NULL) { |