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/Z.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/Z.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/compext/Z.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c index 6ee08e236..8f7de4ee1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c +++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c @@ -67,7 +67,7 @@ char *ZCompressData(const char *plainData, unsigned int plainSize, int threshold *compressedSize = plainSize + (plainSize / 1000) + 12 + 1; - compressedData = Xmalloc(*compressedSize); + compressedData = malloc(*compressedSize); if (compressedData == NULL) { @@ -129,7 +129,7 @@ char *ZCompressData(const char *plainData, unsigned int plainSize, int threshold plainSize, zError(result)); #endif - Xfree(compressedData); + free(compressedData); *compressedSize = 0; @@ -245,7 +245,7 @@ int ZInitEncoder() { int result; - zStream = Xmalloc(sizeof(z_stream)); + zStream = malloc(sizeof(z_stream)); if (zStream == NULL) { @@ -300,7 +300,7 @@ int ZResetEncoder() #endif } - Xfree(zStream); + free(zStream); } zInitialized = 0; |