GUAC-730: Fix headers for guacd.

This commit is contained in:
Michael Jumper 2014-06-10 17:25:40 -07:00
parent ea765ba602
commit cc2f3931a9
3 changed files with 20 additions and 22 deletions

View File

@ -25,10 +25,6 @@
#include "client.h"
#include "log.h"
#include <pthread.h>
#include <stdlib.h>
#include <time.h>
#include <guacamole/client.h>
#include <guacamole/error.h>
#include <guacamole/instruction.h>
@ -36,6 +32,10 @@
#include <guacamole/socket.h>
#include <guacamole/timestamp.h>
#include <pthread.h>
#include <stdlib.h>
#include <time.h>
/**
* Sleep for the given number of milliseconds.
*

View File

@ -25,9 +25,21 @@
#include "client.h"
#include "log.h"
#include <ctype.h>
#include <guacamole/client.h>
#include <guacamole/error.h>
#include <guacamole/instruction.h>
#include <guacamole/plugin.h>
#include <guacamole/protocol.h>
#include <guacamole/socket.h>
#ifdef ENABLE_SSL
#include <openssl/ssl.h>
#include "socket-ssl.h"
#endif
#include <errno.h>
#include <fcntl.h>
#include <getopt.h>
#include <libgen.h>
#include <netdb.h>
#include <netinet/in.h>
@ -41,18 +53,6 @@
#include <sys/types.h>
#include <unistd.h>
#include <guacamole/client.h>
#include <guacamole/error.h>
#include <guacamole/instruction.h>
#include <guacamole/plugin.h>
#include <guacamole/protocol.h>
#include <guacamole/socket.h>
#ifdef ENABLE_SSL
#include <openssl/ssl.h>
#include "socket-ssl.h"
#endif
#define GUACD_DEV_NULL "/dev/null"
#define GUACD_ROOT "/"

View File

@ -22,16 +22,14 @@
#include "config.h"
#include <errno.h>
#include <guacamole/client.h>
#include <guacamole/error.h>
#include <stdarg.h>
#include <stdio.h>
#include <syslog.h>
#include <sys/types.h>
#include <unistd.h>
#include <guacamole/client.h>
#include <guacamole/error.h>
/* Log prefix, defaulting to "guacd" */
char log_prefix[64] = "guacd";