GUAC-730: Fix headers for libguac.

This commit is contained in:
Michael Jumper 2014-06-10 16:54:08 -07:00
parent d19100ca6b
commit 9c475c3a68
17 changed files with 35 additions and 71 deletions

View File

@ -22,20 +22,19 @@
#include "config.h"
#include "wav_encoder.h"
#ifdef ENABLE_OGG
#include "ogg_encoder.h"
#endif
#include <pthread.h>
#include <stdlib.h>
#include <string.h>
#include "wav_encoder.h"
#include <guacamole/audio.h>
#include <guacamole/client.h>
#include <guacamole/protocol.h>
#include <guacamole/stream.h>
#ifdef ENABLE_OGG
#include "ogg_encoder.h"
#endif
#include <stdlib.h>
#include <string.h>
guac_audio_stream* guac_audio_stream_alloc(guac_client* client, guac_audio_encoder* encoder) {

View File

@ -24,10 +24,13 @@
#include "client.h"
#include "client-handlers.h"
#include "instruction.h"
#include "protocol.h"
#include "stream.h"
#include "timestamp.h"
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
/* Guacamole instruction handler map */

View File

@ -25,14 +25,15 @@
#include "client.h"
#include "client-handlers.h"
#include "error.h"
#include "instruction.h"
#include "layer.h"
#include "plugin.h"
#include "pool.h"
#include "protocol.h"
#include "socket.h"
#include "stream.h"
#include "timestamp.h"
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

View File

@ -22,11 +22,11 @@
#include "config.h"
#include <cairo/cairo.h>
#include <stdint.h>
#include <string.h>
#include <cairo/cairo.h>
/*
* Arbitrary hash function whhich maps ALL 32-bit numbers onto 24-bit numbers
* evenly, while guaranteeing that all 24-bit numbers are mapped onto

View File

@ -24,7 +24,6 @@
#include "error.h"
#include "instruction.h"
#include "protocol.h"
#include "socket.h"
#include "unicode.h"

View File

@ -22,15 +22,13 @@
#include "config.h"
#include "audio.h"
#include "ogg_encoder.h"
#include <stdlib.h>
#include <guacamole/audio.h>
#include <guacamole/client.h>
#include <guacamole/protocol.h>
#include <vorbis/vorbisenc.h>
#include <stdlib.h>
void ogg_encoder_begin_handler(guac_audio_stream* audio) {
/* Allocate stream state */
@ -45,7 +43,7 @@ void ogg_encoder_begin_handler(guac_audio_stream* audio) {
vorbis_block_init(&(state->vorbis_state), &(state->vorbis_block));
vorbis_comment_init(&(state->comment));
vorbis_comment_add_tag(&(state->comment), "ENCODER", "libguac-client-rdp");
vorbis_comment_add_tag(&(state->comment), "ENCODER", "libguac");
ogg_stream_init(&(state->ogg_state), rand());

View File

@ -26,7 +26,8 @@
#include "config.h"
#include <guacamole/audio.h>
#include "audio.h"
#include <vorbis/vorbisenc.h>
typedef struct ogg_encoder_state {

View File

@ -24,15 +24,13 @@
#include "palette.h"
#include <inttypes.h>
#include <cairo/cairo.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <cairo/cairo.h>
#include <sys/types.h>
guac_palette* guac_palette_alloc(cairo_surface_t* surface) {
int x, y;

View File

@ -23,12 +23,8 @@
#include "config.h"
#include "client.h"
#include "client-handlers.h"
#include "error.h"
#include "plugin.h"
#include "protocol.h"
#include "socket.h"
#include "time.h"
#include <dlfcn.h>
#include <stdio.h>

View File

@ -25,7 +25,6 @@
#include "pool.h"
#include <stdlib.h>
#include <string.h>
guac_pool* guac_pool_alloc(int size) {

View File

@ -30,15 +30,6 @@
#include "stream.h"
#include "unicode.h"
#include <errno.h>
#include <inttypes.h>
#include <stdarg.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <png.h>
#include <cairo/cairo.h>
@ -46,6 +37,15 @@
#include <pngstruct.h>
#endif
#include <inttypes.h>
#include <setjmp.h>
#include <stdarg.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
/* Output formatting functions */
ssize_t __guac_socket_write_length_string(guac_socket* socket, const char* str) {

View File

@ -25,14 +25,10 @@
#include "error.h"
#include "socket.h"
#include <fcntl.h>
#include <inttypes.h>
#include <stdint.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/time.h>
#include <time.h>
#include <unistd.h>
#ifdef __MINGW32__

View File

@ -22,27 +22,14 @@
#include "config.h"
#include "error.h"
#include "protocol.h"
#include "socket.h"
#include "unicode.h"
#include <fcntl.h>
#include <inttypes.h>
#include <stdint.h>
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <sys/time.h>
#include <time.h>
#include <unistd.h>
#ifdef __MINGW32__
#include <winsock2.h>
#else
#include <sys/select.h>
#endif
#define GUAC_SOCKET_NEST_BUFFER_SIZE 8192
typedef struct __guac_socket_nest_data {

View File

@ -27,23 +27,15 @@
#include "socket.h"
#include "timestamp.h"
#include <fcntl.h>
#include <inttypes.h>
#include <pthread.h>
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/time.h>
#include <time.h>
#include <unistd.h>
#ifdef __MINGW32__
#include <winsock2.h>
#else
#include <sys/select.h>
#endif
char __guac_socket_BASE64_CHARACTERS[64] = {
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',

View File

@ -24,9 +24,7 @@
#include "timestamp.h"
#ifndef HAVE_CLOCK_GETTIME
#include <sys/time.h>
#endif
#if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_NANOSLEEP)
#include <time.h>

View File

@ -22,15 +22,12 @@
#include "config.h"
#include "audio.h"
#include "wav_encoder.h"
#include <stdlib.h>
#include <string.h>
#include <guacamole/audio.h>
#include <guacamole/client.h>
#include <guacamole/protocol.h>
#define WAV_BUFFER_SIZE 0x4000
void wav_encoder_begin_handler(guac_audio_stream* audio) {

View File

@ -26,7 +26,7 @@
#include "config.h"
#include <guacamole/audio.h>
#include "audio.h"
typedef struct wav_encoder_riff_header {