maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add namespace to DEBUG variable, add missing UINT64 type to compat.

Browse Source
This commit is contained in:
Michael Jumper 2013-12-11 22:27:35 -08:00
parent 478235be70
commit c38b687ab6
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/protocols/rdp/compat/winpr-wtypes.h
View File

@ -43,6 +43,7 @@ typedef uint8 BYTE;
typedef uint8 UINT8; typedef uint8 UINT8;
typedef uint16 UINT16; typedef uint16 UINT16;
typedef uint32 UINT32; typedef uint32 UINT32;
typedef uint64 UINT64;
typedef boolean BOOL; typedef boolean BOOL;
#define TRUE true #define TRUE true

14
src/protocols/rdp/debug.h
View File

@ -40,15 +40,15 @@
#include <stdio.h> #include <stdio.h>
/* Ensure DEBUG is defined to a constant */ /* Ensure GUAC_RDP_DEBUG_LEVEL is defined to a constant */
#ifndef DEBUG #ifndef GUAC_RDP_DEBUG_LEVEL
#define DEBUG 0 #define GUAC_RDP_DEBUG_LEVEL 0
#endif #endif
/** /**
* Prints a message to STDERR using the given printf format string and * Prints a message to STDERR using the given printf format string and
* arguments. This will only do anything if the DEBUG macro is defined * arguments. This will only do anything if the GUAC_RDP_DEBUG_LEVEL
* and greater than the given log level. * macro is defined and greater than the given log level.
* *
* @param level The desired log level (an integer). * @param level The desired log level (an integer).
* @param fmt The format to use when printing. * @param fmt The format to use when printing.
@ -57,8 +57,8 @@
*/ */
#define GUAC_RDP_DEBUG(level, fmt, ...) \ #define GUAC_RDP_DEBUG(level, fmt, ...) \
do { \ do { \
if (DEBUG >= level) \ if (GUAC_RDP_DEBUG_LEVEL >= level) \
fprintf(stderr, "%s:%d: %s(): " fmt "\n", \ fprintf(stderr, "%s:%d: %s(): " fmt "\n", \
__FILE__, __LINE__, __func__, __VA_ARGS__); \ __FILE__, __LINE__, __func__, __VA_ARGS__); \
} while (0); } while (0);