diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2016-08-11 22:18:26 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2016-08-11 22:18:26 -0700 |
| commit | d35e57b117e1d018130f8945a06954893408ba0c (patch) | |
| tree | c536561698ceacd40679b1a1a0f68d1fcff66c0e | |
| parent | bb7bac2d9bfefc739b68f455e92c869c41685c5d (diff) | |
| download | xrdp-proprietary-d35e57b117e1d018130f8945a06954893408ba0c.tar.gz xrdp-proprietary-d35e57b117e1d018130f8945a06954893408ba0c.zip | |
Pixman fixes
| -rw-r--r-- | common/pixman-region.c | 4 | ||||
| -rw-r--r-- | common/pixman-region16.c | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/common/pixman-region.c b/common/pixman-region.c index e8917121..b1949950 100644 --- a/common/pixman-region.c +++ b/common/pixman-region.c @@ -204,7 +204,7 @@ alloc_data (size_t n) if (!sz) return NULL; - return malloc (sz); + return (region_data_type_t *) malloc(sz); } #define FREE_DATA(reg) if ((reg)->data && (reg)->data->size) free ((reg)->data) @@ -1703,7 +1703,7 @@ validate (region_type_t * badreg) if (ri == stack_regions) { - rit = malloc (data_size); + rit = (region_info_t *) malloc(data_size); if (!rit) goto bail; memcpy (rit, ri, num_ri * sizeof (region_info_t)); diff --git a/common/pixman-region16.c b/common/pixman-region16.c index 7c9f5cba..637c8a35 100644 --- a/common/pixman-region16.c +++ b/common/pixman-region16.c @@ -42,8 +42,6 @@ #define MIN(x1, x2) ((x1) < (x2) ? (x1) : (x2)) #define MAX(x1, x2) ((x1) > (x2) ? (x1) : (x2)) -typedef int pixman_bool_t; - typedef pixman_box16_t box_type_t; typedef pixman_region16_data_t region_data_type_t; typedef pixman_region16_t region_type_t; diff --git a/configure.ac b/configure.ac index 39547e5d..d2a7938d 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,7 @@ AC_ARG_ENABLE(mp3lame, AS_HELP_STRING([--enable-mp3lame], AM_CONDITIONAL(XRDP_MP3LAME, [test x$enable_mp3lame = xyes]) AC_ARG_ENABLE(pixman, AS_HELP_STRING([--enable-pixman], [Use pixman library (default: no)]), - [], [enable_pimanno]) + [], [enable_pixman=no]) AM_CONDITIONAL(XRDP_PIXMAN, [test x$enable_pixman = xyes]) # checking for openssl |