diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2019-02-06 16:56:55 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2019-02-06 16:56:55 +0100 |
commit | f3f392caec43b4095bc1d84b315ed7972c13c144 (patch) | |
tree | 5c4ba8b5d38f1ae33de71507c5634a15a0b35bfe /libvncserver/scale.c | |
parent | 8c081c8888bccbf5adfe0fc4ec518e2cbfba9871 (diff) | |
parent | 0a70095271d845d16a3ed17354841b01f33963ad (diff) | |
download | libtdevnc-f3f392caec43b4095bc1d84b315ed7972c13c144.tar.gz libtdevnc-f3f392caec43b4095bc1d84b315ed7972c13c144.zip |
Merge tag 'LibVNCServer-0.9.12'
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'libvncserver/scale.c')
-rw-r--r-- | libvncserver/scale.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libvncserver/scale.c b/libvncserver/scale.c index bf67f8e..7a63e86 100644 --- a/libvncserver/scale.c +++ b/libvncserver/scale.c @@ -63,7 +63,18 @@ (double) ((int) (x)) : (double) ((int) (x) + 1) ) #define FLOOR(x) ( (double) ((int) (x)) ) -static inline int pad4(int value) +#ifdef WIN32 +#define InlineX __inline +#else +# ifndef __STRICT_ANSI__ +# define InlineX inline +# else +# define InlineX +# endif +#endif + + +static InlineX int pad4(int value) { int remainder = value & 3; if (!remainder) return value; |