GUACAMOLE-2182: Correct issues with macro redefinitions that cause compiles to fail.#626

mike-jumper merged 2 commits intoapache:staging/1.6.1apache/guacamole-server:staging/1.6.1from

necouchman:jira/2182necouchman/guacamole-server:jira/2182Copy head branch name to clipboard