GUACAMOLE-169: Use proper namespace for internal common headers.

This commit is contained in:
Michael Jumper 2016-09-11 17:28:50 -07:00
parent 0ef87c443b
commit eee928548d
71 changed files with 120 additions and 121 deletions

View File

@ -20,7 +20,7 @@
#ifndef GUAC_COMMON_SSH_SFTP_H #ifndef GUAC_COMMON_SSH_SFTP_H
#define GUAC_COMMON_SSH_SFTP_H #define GUAC_COMMON_SSH_SFTP_H
#include "guac_json.h" #include "common/json.h"
#include "guac_ssh.h" #include "guac_ssh.h"
#include <guacamole/object.h> #include <guacamole/object.h>

View File

@ -22,39 +22,39 @@ ACLOCAL_AMFLAGS = -I m4
noinst_LTLIBRARIES = libguac_common.la noinst_LTLIBRARIES = libguac_common.la
noinst_HEADERS = \ noinst_HEADERS = \
guac_io.h \ common/io.h \
guac_blank_cursor.h \ common/blank_cursor.h \
guac_clipboard.h \ common/clipboard.h \
guac_cursor.h \ common/cursor.h \
guac_display.h \ common/display.h \
guac_dot_cursor.h \ common/dot_cursor.h \
guac_ibar_cursor.h \ common/ibar_cursor.h \
guac_iconv.h \ common/iconv.h \
guac_json.h \ common/json.h \
guac_list.h \ common/list.h \
guac_pointer_cursor.h \ common/pointer_cursor.h \
guac_recording.h \ common/recording.h \
guac_rect.h \ common/rect.h \
guac_string.h \ common/string.h \
guac_surface.h common/surface.h
libguac_common_la_SOURCES = \ libguac_common_la_SOURCES = \
guac_io.c \ io.c \
guac_blank_cursor.c \ blank_cursor.c \
guac_clipboard.c \ clipboard.c \
guac_cursor.c \ cursor.c \
guac_display.c \ display.c \
guac_dot_cursor.c \ dot_cursor.c \
guac_ibar_cursor.c \ ibar_cursor.c \
guac_iconv.c \ iconv.c \
guac_json.c \ json.c \
guac_list.c \ list.c \
guac_pointer_cursor.c \ pointer_cursor.c \
guac_recording.c \ recording.c \
guac_rect.c \ rect.c \
guac_string.c \ string.c \
guac_surface.c surface.c
libguac_common_la_CFLAGS = \ libguac_common_la_CFLAGS = \
-Werror -Wall -pedantic \ -Werror -Wall -pedantic \

View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "guac_clipboard.h" #include "common/clipboard.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/protocol.h> #include <guacamole/protocol.h>

View File

@ -21,7 +21,7 @@
#ifndef GUAC_COMMON_CURSOR_H #ifndef GUAC_COMMON_CURSOR_H
#define GUAC_COMMON_CURSOR_H #define GUAC_COMMON_CURSOR_H
#include "guac_surface.h" #include "surface.h"
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -20,8 +20,8 @@
#ifndef GUAC_COMMON_DISPLAY_H #ifndef GUAC_COMMON_DISPLAY_H
#define GUAC_COMMON_DISPLAY_H #define GUAC_COMMON_DISPLAY_H
#include "guac_cursor.h" #include "cursor.h"
#include "guac_surface.h" #include "surface.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/socket.h> #include <guacamole/socket.h>

View File

@ -21,7 +21,7 @@
#define __GUAC_COMMON_SURFACE_H #define __GUAC_COMMON_SURFACE_H
#include "config.h" #include "config.h"
#include "guac_rect.h" #include "rect.h"
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -17,12 +17,12 @@
* under the License. * under the License.
*/ */
#include "guac_blank_cursor.h" #include "common/blank_cursor.h"
#include "guac_dot_cursor.h" #include "common/dot_cursor.h"
#include "guac_cursor.h" #include "common/cursor.h"
#include "guac_ibar_cursor.h" #include "common/ibar_cursor.h"
#include "guac_pointer_cursor.h" #include "common/pointer_cursor.h"
#include "guac_surface.h" #include "common/surface.h"
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -17,9 +17,9 @@
* under the License. * under the License.
*/ */
#include "guac_cursor.h" #include "common/cursor.h"
#include "guac_display.h" #include "common/display.h"
#include "guac_surface.h" #include "common/surface.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/socket.h> #include <guacamole/socket.h>

View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "guac_iconv.h" #include "common/iconv.h"
#include <guacamole/unicode.h> #include <guacamole/unicode.h>
#include <stdint.h> #include <stdint.h>

View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "guac_io.h" #include "common/io.h"
#include <unistd.h> #include <unistd.h>

View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "guac_json.h" #include "common/json.h"
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>

View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "guac_list.h" #include "common/list.h"
#include <stdlib.h> #include <stdlib.h>
#include <pthread.h> #include <pthread.h>

View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
#include "guac_recording.h" #include "common/recording.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/socket.h> #include <guacamole/socket.h>

View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "guac_rect.h" #include "common/rect.h"
void guac_common_rect_init(guac_common_rect* rect, int x, int y, int width, int height) { void guac_common_rect_init(guac_common_rect* rect, int x, int y, int width, int height) {
rect->x = x; rect->x = x;

View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "guac_string.h" #include "common/string.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@ -18,8 +18,8 @@
*/ */
#include "config.h" #include "config.h"
#include "guac_rect.h" #include "common/rect.h"
#include "guac_surface.h" #include "common/surface.h"
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "guac_list.h" #include "common/list.h"
#include "proc.h" #include "proc.h"
#include "proc-map.h" #include "proc-map.h"
#include "user.h" #include "user.h"

View File

@ -22,7 +22,7 @@
#define _GUACD_PROC_MAP_H #define _GUACD_PROC_MAP_H
#include "config.h" #include "config.h"
#include "guac_list.h" #include "common/list.h"
#include "proc.h" #include "proc.h"
#include "user.h" #include "user.h"

View File

@ -18,8 +18,8 @@
*/ */
#include "config.h" #include "config.h"
#include "common/list.h"
#include "dvc.h" #include "dvc.h"
#include "guac_list.h"
#include "rdp.h" #include "rdp.h"
#include <freerdp/channels/channels.h> #include <freerdp/channels/channels.h>

View File

@ -21,7 +21,7 @@
#define GUAC_RDP_DVC_H #define GUAC_RDP_DVC_H
#include "config.h" #include "config.h"
#include "guac_list.h" #include "common/list.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>

View File

@ -21,10 +21,10 @@
#include "audio_input.h" #include "audio_input.h"
#include "client.h" #include "client.h"
#include "common/cursor.h"
#include "common/display.h"
#include "common/recording.h"
#include "dvc.h" #include "dvc.h"
#include "guac_cursor.h"
#include "guac_display.h"
#include "guac_recording.h"
#include "keyboard.h" #include "keyboard.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_bitmap.h" #include "rdp_bitmap.h"

View File

@ -23,10 +23,10 @@
#include "config.h" #include "config.h"
#include "audio_input.h" #include "audio_input.h"
#include "guac_clipboard.h" #include "common/clipboard.h"
#include "guac_display.h" #include "common/display.h"
#include "guac_surface.h" #include "common/list.h"
#include "guac_list.h" #include "common/surface.h"
#include "keyboard.h" #include "keyboard.h"
#include "rdp_disp.h" #include "rdp_disp.h"
#include "rdp_fs.h" #include "rdp_fs.h"

View File

@ -20,8 +20,8 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "guac_display.h" #include "common/display.h"
#include "guac_surface.h" #include "common/surface.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_bitmap.h" #include "rdp_bitmap.h"
#include "rdp_settings.h" #include "rdp_settings.h"

View File

@ -22,7 +22,7 @@
#define _GUAC_RDP_RDP_BITMAP_H #define _GUAC_RDP_RDP_BITMAP_H
#include "config.h" #include "config.h"
#include "guac_display.h" #include "common/display.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <guacamole/layer.h> #include <guacamole/layer.h>

View File

@ -20,10 +20,10 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "common/clipboard.h"
#include "common/iconv.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_cliprdr.h" #include "rdp_cliprdr.h"
#include "guac_clipboard.h"
#include "guac_iconv.h"
#include <freerdp/channels/channels.h> #include <freerdp/channels/channels.h>
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>

View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "guac_surface.h" #include "common/surface.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_bitmap.h" #include "rdp_bitmap.h"
#include "rdp_color.h" #include "rdp_color.h"

View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "guac_surface.h" #include "common/surface.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_color.h" #include "rdp_color.h"
#include "rdp_glyph.h" #include "rdp_glyph.h"

View File

@ -20,8 +20,8 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "guac_cursor.h" #include "common/cursor.h"
#include "guac_display.h" #include "common/display.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_pointer.h" #include "rdp_pointer.h"

View File

@ -22,7 +22,7 @@
#define _GUAC_RDP_RDP_POINTER_H #define _GUAC_RDP_RDP_POINTER_H
#include "config.h" #include "config.h"
#include "guac_display.h" #include "common/display.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>

View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "guac_string.h" #include "common/string.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_settings.h" #include "rdp_settings.h"
#include "resolution.h" #include "resolution.h"

View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "guac_clipboard.h" #include "common/clipboard.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_fs.h" #include "rdp_fs.h"
#include "rdp_svc.h" #include "rdp_svc.h"

View File

@ -22,7 +22,7 @@
#define _GUAC_RDP_STREAM_H #define _GUAC_RDP_STREAM_H
#include "config.h" #include "config.h"
#include "guac_json.h" #include "common/json.h"
#include "rdp_svc.h" #include "rdp_svc.h"
#include <guacamole/user.h> #include <guacamole/user.h>

View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "guac_list.h" #include "common/list.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_svc.h" #include "rdp_svc.h"

View File

@ -20,8 +20,8 @@
#include "config.h" #include "config.h"
#include "audio_input.h" #include "audio_input.h"
#include "common/display.h"
#include "input.h" #include "input.h"
#include "guac_display.h"
#include "user.h" #include "user.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_settings.h" #include "rdp_settings.h"

View File

@ -19,8 +19,8 @@
#include "config.h" #include "config.h"
#include "guac_cursor.h" #include "common/cursor.h"
#include "guac_display.h" #include "common/display.h"
#include "ssh.h" #include "ssh.h"
#include "terminal.h" #include "terminal.h"

View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "guac_recording.h" #include "common/recording.h"
#include "guac_sftp.h" #include "guac_sftp.h"
#include "guac_ssh.h" #include "guac_ssh.h"
#include "settings.h" #include "settings.h"

View File

@ -20,8 +20,8 @@
#include "config.h" #include "config.h"
#include "clipboard.h" #include "clipboard.h"
#include "common/display.h"
#include "input.h" #include "input.h"
#include "guac_display.h"
#include "user.h" #include "user.h"
#include "sftp.h" #include "sftp.h"
#include "ssh.h" #include "ssh.h"

View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "guac_recording.h" #include "common/recording.h"
#include "telnet.h" #include "telnet.h"
#include "terminal.h" #include "terminal.h"

View File

@ -20,8 +20,8 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "clipboard.h" #include "clipboard.h"
#include "guac_clipboard.h" #include "common/clipboard.h"
#include "guac_iconv.h" #include "common/iconv.h"
#include "user.h" #include "user.h"
#include "vnc.h" #include "vnc.h"

View File

@ -20,9 +20,9 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "guac_cursor.h" #include "common/cursor.h"
#include "guac_display.h" #include "common/display.h"
#include "guac_surface.h" #include "common/surface.h"
#include "vnc.h" #include "vnc.h"
#include <cairo/cairo.h> #include <cairo/cairo.h>

View File

@ -20,8 +20,8 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "guac_iconv.h" #include "common/iconv.h"
#include "guac_surface.h" #include "common/surface.h"
#include "vnc.h" #include "vnc.h"
#include <cairo/cairo.h> #include <cairo/cairo.h>

View File

@ -19,8 +19,8 @@
#include "config.h" #include "config.h"
#include "guac_cursor.h" #include "common/cursor.h"
#include "guac_display.h" #include "common/display.h"
#include "vnc.h" #include "vnc.h"
#include <guacamole/user.h> #include <guacamole/user.h>

View File

@ -20,8 +20,8 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "guac_iconv.h" #include "common/iconv.h"
#include "guac_surface.h" #include "common/surface.h"
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -23,8 +23,8 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "guac_iconv.h" #include "common/iconv.h"
#include "guac_surface.h" #include "common/surface.h"
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -21,9 +21,9 @@
#include "clipboard.h" #include "clipboard.h"
#include "input.h" #include "input.h"
#include "guac_display.h" #include "common/display.h"
#include "guac_dot_cursor.h" #include "common/dot_cursor.h"
#include "guac_pointer_cursor.h" #include "common/pointer_cursor.h"
#include "user.h" #include "user.h"
#include "sftp.h" #include "sftp.h"
#include "vnc.h" #include "vnc.h"

View File

@ -22,12 +22,12 @@
#include "auth.h" #include "auth.h"
#include "client.h" #include "client.h"
#include "clipboard.h" #include "clipboard.h"
#include "common/clipboard.h"
#include "common/cursor.h"
#include "common/display.h"
#include "common/recording.h"
#include "cursor.h" #include "cursor.h"
#include "display.h" #include "display.h"
#include "guac_clipboard.h"
#include "guac_cursor.h"
#include "guac_display.h"
#include "guac_recording.h"
#include "log.h" #include "log.h"
#include "settings.h" #include "settings.h"
#include "vnc.h" #include "vnc.h"

View File

@ -22,10 +22,10 @@
#include "config.h" #include "config.h"
#include "guac_clipboard.h" #include "common/clipboard.h"
#include "guac_display.h" #include "common/display.h"
#include "guac_iconv.h" #include "common/iconv.h"
#include "guac_surface.h" #include "common/surface.h"
#include "settings.h" #include "settings.h"
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -20,8 +20,8 @@
#include "config.h" #include "config.h"
#include "common.h" #include "common.h"
#include "common/surface.h"
#include "display.h" #include "display.h"
#include "guac_surface.h"
#include "types.h" #include "types.h"
#include <math.h> #include <math.h>

View File

@ -23,7 +23,7 @@
#include "config.h" #include "config.h"
#include "guac_surface.h" #include "common/surface.h"
#include "types.h" #include "types.h"
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -21,10 +21,9 @@
#include "buffer.h" #include "buffer.h"
#include "common.h" #include "common.h"
#include "common/clipboard.h"
#include "common/cursor.h"
#include "display.h" #include "display.h"
#include "guac_clipboard.h"
#include "guac_cursor.h"
#include "scrollbar.h"
#include "terminal.h" #include "terminal.h"
#include "terminal_handlers.h" #include "terminal_handlers.h"
#include "types.h" #include "types.h"

View File

@ -24,9 +24,9 @@
#include "config.h" #include "config.h"
#include "buffer.h" #include "buffer.h"
#include "common/clipboard.h"
#include "common/cursor.h"
#include "display.h" #include "display.h"
#include "guac_clipboard.h"
#include "guac_cursor.h"
#include "scrollbar.h" #include "scrollbar.h"
#include "types.h" #include "types.h"
#include "typescript.h" #include "typescript.h"

View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "guac_io.h" #include "common/io.h"
#include "typescript.h" #include "typescript.h"
#include <guacamole/timestamp.h> #include <guacamole/timestamp.h>

View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "common_suite.h" #include "common_suite.h"
#include "guac_iconv.h" #include "common/iconv.h"
#include <stdlib.h> #include <stdlib.h>
#include <CUnit/Basic.h> #include <CUnit/Basic.h>

View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "common_suite.h" #include "common_suite.h"
#include "guac_rect.h" #include "common/rect.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>

View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "common_suite.h" #include "common_suite.h"
#include "guac_string.h" #include "common/string.h"
#include <stdlib.h> #include <stdlib.h>
#include <CUnit/Basic.h> #include <CUnit/Basic.h>