mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include stdint.h, don't redefine MAX/MIN constants if already defined

Browse Source
This commit is contained in:
Jay Sorg 2016-08-12 12:16:14 -07:00
parent d35e57b117
commit f4f23b0a7d
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/Makefile.am
View File

@ -1,11 +1,11 @@
EXTRA_FILES =
if XRDP_PIXMAN if XRDP_PIXMAN
PIXMAN_SOURCES =
else else
EXTRA_FILES += pixman-region16.c pixman-region.h PIXMAN_SOURCES = pixman-region16.c pixman-region.h
endif endif
EXTRA_DIST = pixman-region.c
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
@ -45,7 +45,7 @@ libcommon_la_SOURCES = \
xrdp_client_info.h \ xrdp_client_info.h \
xrdp_constants.h \ xrdp_constants.h \
xrdp_rail.h \ xrdp_rail.h \
$(EXTRA_FILES) $(PIXMAN_SOURCES)
libcommon_la_LIBADD = \ libcommon_la_LIBADD = \
-lcrypto \ -lcrypto \

12
common/pixman-region16.c
View File

@ -26,14 +26,26 @@
/* taken from pixman 0.34 /* taken from pixman 0.34
altered to compile without all of pixman */ altered to compile without all of pixman */
#if defined(HAVE_CONFIG_H)
#include "config_ac.h"
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#if defined(HAVE_STDINT_H)
#include <stdint.h>
#endif
#include "pixman-region.h" #include "pixman-region.h"
#if !defined(UINT32_MAX)
#define UINT32_MAX (4294967295U) #define UINT32_MAX (4294967295U)
#endif
#if !defined(INT16_MIN)
#define INT16_MIN (-32767-1) #define INT16_MIN (-32767-1)
#endif
#if !defined(INT16_MAX)
#define INT16_MAX (32767) #define INT16_MAX (32767)
#endif
#define PIXMAN_EXPORT #define PIXMAN_EXPORT
#define FALSE 0 #define FALSE 0