From 8c8a82c31f768bfe483a56fa59e484a4ac348702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Thu, 21 Mar 2013 16:45:25 -0400 Subject: [PATCH] libfreerdp-utils: purge old STREAM utils --- channels/audin/client/audin_main.c | 2 +- channels/audin/server/audin.c | 2 +- channels/cliprdr/client/cliprdr_main.h | 3 +- channels/drdynvc/client/drdynvc_main.c | 2 +- channels/drdynvc/client/dvcman.c | 2 +- channels/drive/client/drive_file.c | 2 +- channels/drive/client/drive_main.c | 2 +- channels/echo/client/echo_main.c | 2 +- channels/parallel/client/parallel_main.c | 2 +- channels/printer/client/printer_main.c | 2 +- channels/rail/client/rail_main.h | 3 +- channels/rdpdr/client/devman.c | 2 +- channels/rdpdr/client/irp.c | 2 +- channels/rdpdr/client/rdpdr_capabilities.c | 2 +- channels/rdpdr/client/rdpdr_main.c | 2 +- channels/rdpei/client/rdpei_main.c | 2 +- channels/rdpsnd/client/rdpsnd_main.c | 2 +- channels/rdpsnd/server/rdpsnd.c | 2 +- channels/sample/client/sample_main.c | 2 +- channels/serial/client/serial_main.c | 2 +- channels/serial/client/serial_tty.c | 2 +- channels/serial/client/serial_tty.h | 3 +- channels/server/channels.h | 2 +- .../smartcard/client/smartcard_operations.c | 2 +- channels/tsmf/client/tsmf_codec.c | 2 +- channels/tsmf/client/tsmf_ifman.c | 2 +- channels/tsmf/client/tsmf_main.c | 2 +- channels/tsmf/client/tsmf_media.c | 6 ++-- channels/urbdrc/client/urbdrc_types.h | 3 +- client/Windows/wf_cliprdr.c | 2 +- client/X11/xf_cliprdr.c | 2 +- cunit/test_bitmap.c | 2 +- cunit/test_freerdp.h | 2 +- cunit/test_gcc.c | 2 +- cunit/test_license.c | 2 +- cunit/test_mcs.c | 2 +- cunit/test_orders.c | 2 +- include/freerdp/cache/bitmap.h | 3 +- include/freerdp/cache/brush.h | 3 +- include/freerdp/cache/cache.h | 3 +- include/freerdp/cache/glyph.h | 3 +- include/freerdp/cache/nine_grid.h | 3 +- include/freerdp/cache/offscreen.h | 3 +- include/freerdp/cache/palette.h | 3 +- include/freerdp/cache/pointer.h | 3 +- include/freerdp/channels/rdpdr.h | 2 +- include/freerdp/codec/nsc.h | 3 +- include/freerdp/codec/rfx.h | 3 +- include/freerdp/crypto/ber.h | 3 +- include/freerdp/crypto/certificate.h | 3 +- include/freerdp/crypto/er.h | 4 ++- include/freerdp/crypto/per.h | 3 +- include/freerdp/crypto/tls.h | 3 +- include/freerdp/freerdp.h | 3 +- include/freerdp/rail/icon.h | 3 +- include/freerdp/rail/rail.h | 3 +- include/freerdp/rail/window.h | 3 +- include/freerdp/rail/window_list.h | 3 +- include/freerdp/update.h | 2 +- include/freerdp/utils/msusb.h | 2 +- include/freerdp/utils/rail.h | 3 +- include/freerdp/utils/stream.h | 32 ------------------- include/freerdp/utils/string.h | 3 +- include/freerdp/utils/svc_plugin.h | 2 +- libfreerdp/cache/bitmap.c | 2 +- libfreerdp/cache/brush.c | 2 +- libfreerdp/cache/cache.c | 2 +- libfreerdp/cache/glyph.c | 2 +- libfreerdp/cache/nine_grid.c | 2 +- libfreerdp/cache/offscreen.c | 2 +- libfreerdp/cache/pointer.c | 2 +- libfreerdp/codec/bitmap.c | 2 +- libfreerdp/codec/jpeg.c | 2 +- libfreerdp/codec/rfx_decode.c | 2 +- libfreerdp/core/capabilities.h | 3 +- libfreerdp/core/certificate.h | 3 +- libfreerdp/core/channel.c | 2 +- libfreerdp/core/fastpath.c | 2 +- libfreerdp/core/fastpath.h | 3 +- libfreerdp/core/gateway/ncacn_http.h | 3 +- libfreerdp/core/gateway/ntlm.h | 4 ++- libfreerdp/core/gateway/rpc.h | 1 - libfreerdp/core/gcc.h | 4 ++- libfreerdp/core/info.h | 3 +- libfreerdp/core/input.h | 3 +- libfreerdp/core/license.h | 4 ++- libfreerdp/core/mcs.h | 4 ++- libfreerdp/core/nego.h | 4 ++- libfreerdp/core/nla.h | 2 +- libfreerdp/core/orders.h | 4 ++- libfreerdp/core/rdp.h | 3 +- libfreerdp/core/redirection.h | 3 +- libfreerdp/core/security.h | 3 +- libfreerdp/core/surface.h | 3 +- libfreerdp/core/tcp.c | 2 +- libfreerdp/core/tcp.h | 3 +- libfreerdp/core/timezone.h | 3 +- libfreerdp/core/tpdu.h | 2 +- libfreerdp/core/tpkt.h | 2 +- libfreerdp/core/transport.c | 2 +- libfreerdp/core/transport.h | 3 +- libfreerdp/core/update.h | 4 ++- libfreerdp/core/window.h | 2 +- libfreerdp/crypto/ber.c | 2 ++ libfreerdp/crypto/der.c | 2 ++ libfreerdp/crypto/er.c | 2 ++ libfreerdp/crypto/tls.c | 2 +- libfreerdp/rail/icon.c | 2 +- libfreerdp/rail/rail.c | 2 +- libfreerdp/rail/window.c | 2 +- libfreerdp/rail/window_list.c | 2 +- libfreerdp/utils/CMakeLists.txt | 1 - libfreerdp/utils/stream.c | 30 ----------------- libfreerdp/utils/svc_plugin.c | 2 +- server/Mac/mf_interface.h | 5 +-- server/Mac/mf_peer.c | 2 +- server/Windows/wf_peer.c | 2 +- server/X11/xf_peer.h | 2 +- 118 files changed, 176 insertions(+), 177 deletions(-) delete mode 100644 include/freerdp/utils/stream.h delete mode 100644 libfreerdp/utils/stream.c diff --git a/channels/audin/client/audin_main.c b/channels/audin/client/audin_main.c index 3112075c5..428684519 100644 --- a/channels/audin/client/audin_main.c +++ b/channels/audin/client/audin_main.c @@ -30,7 +30,7 @@ #include -#include +#include #include "audin_main.h" diff --git a/channels/audin/server/audin.c b/channels/audin/server/audin.c index 676224e34..b4f01ebff 100644 --- a/channels/audin/server/audin.c +++ b/channels/audin/server/audin.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/channels/cliprdr/client/cliprdr_main.h b/channels/cliprdr/client/cliprdr_main.h index 6e72d1d88..b2b984d31 100644 --- a/channels/cliprdr/client/cliprdr_main.h +++ b/channels/cliprdr/client/cliprdr_main.h @@ -21,8 +21,9 @@ #ifndef __CLIPRDR_MAIN_H #define __CLIPRDR_MAIN_H +#include + #include -#include struct _CLIPRDR_FORMAT_NAME { diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c index b1250efb0..5b7913717 100644 --- a/channels/drdynvc/client/drdynvc_main.c +++ b/channels/drdynvc/client/drdynvc_main.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include "dvcman.h" diff --git a/channels/drdynvc/client/dvcman.c b/channels/drdynvc/client/dvcman.c index fe236287f..8d1991f38 100644 --- a/channels/drdynvc/client/dvcman.c +++ b/channels/drdynvc/client/dvcman.c @@ -30,7 +30,7 @@ #include -#include +#include #include #include "drdynvc_types.h" diff --git a/channels/drive/client/drive_file.c b/channels/drive/client/drive_file.c index 53a687009..aa5a3d5f2 100644 --- a/channels/drive/client/drive_file.c +++ b/channels/drive/client/drive_file.c @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c index 17d8945eb..8e7d1c8a1 100644 --- a/channels/drive/client/drive_main.c +++ b/channels/drive/client/drive_main.c @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include diff --git a/channels/echo/client/echo_main.c b/channels/echo/client/echo_main.c index 63b4fde68..595844918 100644 --- a/channels/echo/client/echo_main.c +++ b/channels/echo/client/echo_main.c @@ -30,7 +30,7 @@ #include -#include +#include #include "echo_main.h" diff --git a/channels/parallel/client/parallel_main.c b/channels/parallel/client/parallel_main.c index 9253cb369..4b210b1c5 100644 --- a/channels/parallel/client/parallel_main.c +++ b/channels/parallel/client/parallel_main.c @@ -52,7 +52,7 @@ #include #include -#include +#include #include #include diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c index 322c7f322..c0bce3c9a 100644 --- a/channels/printer/client/printer_main.c +++ b/channels/printer/client/printer_main.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/channels/rail/client/rail_main.h b/channels/rail/client/rail_main.h index 802189934..6e0abb179 100644 --- a/channels/rail/client/rail_main.h +++ b/channels/rail/client/rail_main.h @@ -25,9 +25,10 @@ #include #include #include -#include #include +#include + struct rdp_rail_order { rdpSettings* settings; diff --git a/channels/rdpdr/client/devman.c b/channels/rdpdr/client/devman.c index ff2f6e4d2..5862e6b87 100644 --- a/channels/rdpdr/client/devman.c +++ b/channels/rdpdr/client/devman.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/channels/rdpdr/client/irp.c b/channels/rdpdr/client/irp.c index 933c55e79..19e83879e 100644 --- a/channels/rdpdr/client/irp.c +++ b/channels/rdpdr/client/irp.c @@ -28,7 +28,7 @@ #include -#include +#include #include #include "rdpdr_main.h" diff --git a/channels/rdpdr/client/rdpdr_capabilities.c b/channels/rdpdr/client/rdpdr_capabilities.c index 08a5f60f8..081f035cd 100644 --- a/channels/rdpdr/client/rdpdr_capabilities.c +++ b/channels/rdpdr/client/rdpdr_capabilities.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include "rdpdr_main.h" diff --git a/channels/rdpdr/client/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c index e8ea220aa..58acdbf46 100644 --- a/channels/rdpdr/client/rdpdr_main.c +++ b/channels/rdpdr/client/rdpdr_main.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c index 14f29d6d3..2f866d7ab 100644 --- a/channels/rdpei/client/rdpei_main.c +++ b/channels/rdpei/client/rdpei_main.c @@ -30,7 +30,7 @@ #include -#include +#include #include "rdpei_main.h" diff --git a/channels/rdpsnd/client/rdpsnd_main.c b/channels/rdpsnd/client/rdpsnd_main.c index 082f22f04..f70593656 100644 --- a/channels/rdpsnd/client/rdpsnd_main.c +++ b/channels/rdpsnd/client/rdpsnd_main.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include diff --git a/channels/rdpsnd/server/rdpsnd.c b/channels/rdpsnd/server/rdpsnd.c index 1b9d68588..759d36afa 100644 --- a/channels/rdpsnd/server/rdpsnd.c +++ b/channels/rdpsnd/server/rdpsnd.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/channels/sample/client/sample_main.c b/channels/sample/client/sample_main.c index 28a3fdf9b..9d73fab07 100644 --- a/channels/sample/client/sample_main.c +++ b/channels/sample/client/sample_main.c @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c index 8cdd64b79..f505c2c00 100644 --- a/channels/serial/client/serial_main.c +++ b/channels/serial/client/serial_main.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include typedef struct _SERIAL_DEVICE SERIAL_DEVICE; diff --git a/channels/serial/client/serial_tty.c b/channels/serial/client/serial_tty.c index d644d8604..a75908888 100644 --- a/channels/serial/client/serial_tty.c +++ b/channels/serial/client/serial_tty.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include diff --git a/channels/serial/client/serial_tty.h b/channels/serial/client/serial_tty.h index 7f89263e3..f75a3988d 100644 --- a/channels/serial/client/serial_tty.h +++ b/channels/serial/client/serial_tty.h @@ -29,7 +29,8 @@ #endif #include -#include + +#include typedef struct _SERIAL_TTY SERIAL_TTY; diff --git a/channels/server/channels.h b/channels/server/channels.h index 96d90eef5..d6fa95278 100644 --- a/channels/server/channels.h +++ b/channels/server/channels.h @@ -22,12 +22,12 @@ #define __WTSVC_H #include -#include #include #include #include #include +#include #ifdef WITH_DEBUG_DVC #define DEBUG_DVC(fmt, ...) DEBUG_CLASS(DVC, fmt, ## __VA_ARGS__) diff --git a/channels/smartcard/client/smartcard_operations.c b/channels/smartcard/client/smartcard_operations.c index 817c49139..5d10b9543 100644 --- a/channels/smartcard/client/smartcard_operations.c +++ b/channels/smartcard/client/smartcard_operations.c @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include #include diff --git a/channels/tsmf/client/tsmf_codec.c b/channels/tsmf/client/tsmf_codec.c index cefde80d8..6e15dd358 100644 --- a/channels/tsmf/client/tsmf_codec.c +++ b/channels/tsmf/client/tsmf_codec.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include "tsmf_constants.h" diff --git a/channels/tsmf/client/tsmf_ifman.c b/channels/tsmf/client/tsmf_ifman.c index dd92246bf..b3bd1e97b 100644 --- a/channels/tsmf/client/tsmf_ifman.c +++ b/channels/tsmf/client/tsmf_ifman.c @@ -28,7 +28,7 @@ #include -#include +#include #include "tsmf_types.h" #include "tsmf_constants.h" diff --git a/channels/tsmf/client/tsmf_main.c b/channels/tsmf/client/tsmf_main.c index 08ff44960..ffc1c6612 100644 --- a/channels/tsmf/client/tsmf_main.c +++ b/channels/tsmf/client/tsmf_main.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include "tsmf_types.h" #include "tsmf_constants.h" diff --git a/channels/tsmf/client/tsmf_media.c b/channels/tsmf/client/tsmf_media.c index c5e80a61d..cfc03b056 100644 --- a/channels/tsmf/client/tsmf_media.c +++ b/channels/tsmf/client/tsmf_media.c @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include #include @@ -53,6 +53,8 @@ #include "tsmf_codec.h" #include "tsmf_media.h" +#include + #define AUDIO_TOLERANCE 10000000LL struct _TSMF_PRESENTATION @@ -879,7 +881,7 @@ void tsmf_presentation_set_audio_device(TSMF_PRESENTATION* presentation, const c static void tsmf_stream_flush(TSMF_STREAM* stream) { - TSMF_SAMPLE* sample; + //TSMF_SAMPLE* sample; /* TODO: free lists */ diff --git a/channels/urbdrc/client/urbdrc_types.h b/channels/urbdrc/client/urbdrc_types.h index 485595004..3b83cee02 100644 --- a/channels/urbdrc/client/urbdrc_types.h +++ b/channels/urbdrc/client/urbdrc_types.h @@ -28,13 +28,14 @@ #include #include #include -#include #include #include #include #include +#include + #ifdef WITH_DEBUG_DVC #define DEBUG_DVC(fmt, ...) DEBUG_CLASS(DVC, fmt, ## __VA_ARGS__) #else diff --git a/client/Windows/wf_cliprdr.c b/client/Windows/wf_cliprdr.c index 6b1213de1..434380645 100644 --- a/client/Windows/wf_cliprdr.c +++ b/client/Windows/wf_cliprdr.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include "wf_cliprdr.h" diff --git a/client/X11/xf_cliprdr.c b/client/X11/xf_cliprdr.c index bce4cbf31..78299cf31 100644 --- a/client/X11/xf_cliprdr.c +++ b/client/X11/xf_cliprdr.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include "xf_cliprdr.h" diff --git a/cunit/test_bitmap.c b/cunit/test_bitmap.c index e6a860757..f731ec120 100644 --- a/cunit/test_bitmap.c +++ b/cunit/test_bitmap.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include "test_bitmap.h" diff --git a/cunit/test_freerdp.h b/cunit/test_freerdp.h index b78900b73..4ba11ae9c 100644 --- a/cunit/test_freerdp.h +++ b/cunit/test_freerdp.h @@ -22,8 +22,8 @@ #include #include #include -#include #include +#include #define add_test_suite(name) \ CU_pSuite pSuite; \ diff --git a/cunit/test_gcc.c b/cunit/test_gcc.c index aabebd2e0..e2f41ec7b 100644 --- a/cunit/test_gcc.c +++ b/cunit/test_gcc.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include "test_gcc.h" diff --git a/cunit/test_license.c b/cunit/test_license.c index 8a2b035a5..e04510a5b 100644 --- a/cunit/test_license.c +++ b/cunit/test_license.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include "test_license.h" diff --git a/cunit/test_mcs.c b/cunit/test_mcs.c index 5d78fdae6..f9a0e9dba 100644 --- a/cunit/test_mcs.c +++ b/cunit/test_mcs.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include "test_mcs.h" diff --git a/cunit/test_orders.c b/cunit/test_orders.c index 7b95daedf..08d030a65 100644 --- a/cunit/test_orders.c +++ b/cunit/test_orders.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include "test_orders.h" #include "libfreerdp/core/orders.h" diff --git a/include/freerdp/cache/bitmap.h b/include/freerdp/cache/bitmap.h index 6a68b8068..7883b4c51 100644 --- a/include/freerdp/cache/bitmap.h +++ b/include/freerdp/cache/bitmap.h @@ -24,7 +24,8 @@ #include #include #include -#include + +#include typedef struct _BITMAP_V2_CELL BITMAP_V2_CELL; typedef struct rdp_bitmap_cache rdpBitmapCache; diff --git a/include/freerdp/cache/brush.h b/include/freerdp/cache/brush.h index 93d1fd679..3c3131541 100644 --- a/include/freerdp/cache/brush.h +++ b/include/freerdp/cache/brush.h @@ -24,7 +24,8 @@ #include #include #include -#include + +#include typedef struct _BRUSH_ENTRY BRUSH_ENTRY; typedef struct rdp_brush_cache rdpBrushCache; diff --git a/include/freerdp/cache/cache.h b/include/freerdp/cache/cache.h index 7b0dbe4a8..a25812ba5 100644 --- a/include/freerdp/cache/cache.h +++ b/include/freerdp/cache/cache.h @@ -23,7 +23,8 @@ #include #include #include -#include + +#include #include #include diff --git a/include/freerdp/cache/glyph.h b/include/freerdp/cache/glyph.h index 4e193987a..35f702598 100644 --- a/include/freerdp/cache/glyph.h +++ b/include/freerdp/cache/glyph.h @@ -23,7 +23,8 @@ #include #include #include -#include + +#include typedef struct _GLYPH_CACHE GLYPH_CACHE; typedef struct _FRAGMENT_CACHE_ENTRY FRAGMENT_CACHE_ENTRY; diff --git a/include/freerdp/cache/nine_grid.h b/include/freerdp/cache/nine_grid.h index 77e0f4636..3f5525bb4 100644 --- a/include/freerdp/cache/nine_grid.h +++ b/include/freerdp/cache/nine_grid.h @@ -24,7 +24,8 @@ #include #include #include -#include + +#include typedef struct _NINE_GRID_ENTRY NINE_GRID_ENTRY; typedef struct rdp_nine_grid_cache rdpNineGridCache; diff --git a/include/freerdp/cache/offscreen.h b/include/freerdp/cache/offscreen.h index 4da367b75..0ed319769 100644 --- a/include/freerdp/cache/offscreen.h +++ b/include/freerdp/cache/offscreen.h @@ -24,7 +24,8 @@ #include #include #include -#include + +#include typedef struct rdp_offscreen_cache rdpOffscreenCache; diff --git a/include/freerdp/cache/palette.h b/include/freerdp/cache/palette.h index 6e7d890ec..80fa747b1 100644 --- a/include/freerdp/cache/palette.h +++ b/include/freerdp/cache/palette.h @@ -24,7 +24,8 @@ #include #include #include -#include + +#include typedef struct _PALETTE_TABLE_ENTRY PALETTE_TABLE_ENTRY; typedef struct rdp_palette_cache rdpPaletteCache; diff --git a/include/freerdp/cache/pointer.h b/include/freerdp/cache/pointer.h index ccfeae03b..949c3f0e6 100644 --- a/include/freerdp/cache/pointer.h +++ b/include/freerdp/cache/pointer.h @@ -25,7 +25,8 @@ #include #include #include -#include + +#include typedef struct rdp_pointer_cache rdpPointerCache; diff --git a/include/freerdp/channels/rdpdr.h b/include/freerdp/channels/rdpdr.h index 68f37798b..4aa209481 100644 --- a/include/freerdp/channels/rdpdr.h +++ b/include/freerdp/channels/rdpdr.h @@ -25,10 +25,10 @@ #include #include #include +#include #include #include -#include #include /* RDPDR_HEADER.Component */ diff --git a/include/freerdp/codec/nsc.h b/include/freerdp/codec/nsc.h index e31d98ebc..16fc580f1 100644 --- a/include/freerdp/codec/nsc.h +++ b/include/freerdp/codec/nsc.h @@ -24,7 +24,8 @@ #include #include #include -#include + +#include #ifdef __cplusplus extern "C" { diff --git a/include/freerdp/codec/rfx.h b/include/freerdp/codec/rfx.h index 63036944a..d3ba0536a 100644 --- a/include/freerdp/codec/rfx.h +++ b/include/freerdp/codec/rfx.h @@ -23,7 +23,8 @@ #include #include #include -#include + +#include #ifdef __cplusplus extern "C" { diff --git a/include/freerdp/crypto/ber.h b/include/freerdp/crypto/ber.h index c9f533cf3..2f04c87e3 100644 --- a/include/freerdp/crypto/ber.h +++ b/include/freerdp/crypto/ber.h @@ -22,7 +22,8 @@ #include #include -#include + +#include /* BER type */ diff --git a/include/freerdp/crypto/certificate.h b/include/freerdp/crypto/certificate.h index 8a496b693..d634c90f4 100644 --- a/include/freerdp/crypto/certificate.h +++ b/include/freerdp/crypto/certificate.h @@ -28,8 +28,9 @@ typedef struct rdp_certificate_store rdpCertificateStore; #include #include -#include + #include +#include struct rdp_certificate_data { diff --git a/include/freerdp/crypto/er.h b/include/freerdp/crypto/er.h index 2cb24cdf0..91110e184 100644 --- a/include/freerdp/crypto/er.h +++ b/include/freerdp/crypto/er.h @@ -23,7 +23,9 @@ #include #include -#include + + +#include /* ER type */ diff --git a/include/freerdp/crypto/per.h b/include/freerdp/crypto/per.h index ced1acd26..60487a81a 100644 --- a/include/freerdp/crypto/per.h +++ b/include/freerdp/crypto/per.h @@ -21,7 +21,8 @@ #define FREERDP_CRYPTO_PER_H #include -#include + +#include FREERDP_API BOOL per_read_length(wStream* s, UINT16* length); FREERDP_API void per_write_length(wStream* s, int length); diff --git a/include/freerdp/crypto/tls.h b/include/freerdp/crypto/tls.h index 527f69ba0..258ee2ebb 100644 --- a/include/freerdp/crypto/tls.h +++ b/include/freerdp/crypto/tls.h @@ -31,7 +31,8 @@ #include #include -#include + +#include typedef struct rdp_tls rdpTls; diff --git a/include/freerdp/freerdp.h b/include/freerdp/freerdp.h index 5f593a402..24654f58d 100644 --- a/include/freerdp/freerdp.h +++ b/include/freerdp/freerdp.h @@ -36,7 +36,8 @@ typedef struct rdp_freerdp_peer freerdp_peer; #include #include #include -#include + +#include #include #include diff --git a/include/freerdp/rail/icon.h b/include/freerdp/rail/icon.h index 1a4cf68d4..109750afc 100644 --- a/include/freerdp/rail/icon.h +++ b/include/freerdp/rail/icon.h @@ -24,7 +24,8 @@ #include #include #include -#include + +#include typedef struct rdp_icon rdpIcon; typedef struct rdp_icon_cache rdpIconCache; diff --git a/include/freerdp/rail/rail.h b/include/freerdp/rail/rail.h index 17d575437..cb8340717 100644 --- a/include/freerdp/rail/rail.h +++ b/include/freerdp/rail/rail.h @@ -25,9 +25,10 @@ #include #include #include -#include #include +#include + #include #include #include diff --git a/include/freerdp/rail/window.h b/include/freerdp/rail/window.h index 6eeadd1ba..0514951cb 100644 --- a/include/freerdp/rail/window.h +++ b/include/freerdp/rail/window.h @@ -24,7 +24,8 @@ #include #include #include -#include + +#include typedef struct rdp_window rdpWindow; diff --git a/include/freerdp/rail/window_list.h b/include/freerdp/rail/window_list.h index a1fcf8b48..615c94ded 100644 --- a/include/freerdp/rail/window_list.h +++ b/include/freerdp/rail/window_list.h @@ -23,7 +23,8 @@ #include #include #include -#include + +#include typedef struct rdp_window_list rdpWindowList; diff --git a/include/freerdp/update.h b/include/freerdp/update.h index 96bd7b6be..047a4ec17 100644 --- a/include/freerdp/update.h +++ b/include/freerdp/update.h @@ -25,6 +25,7 @@ typedef struct rdp_update rdpUpdate; #include #include #include +#include #include #include @@ -32,7 +33,6 @@ typedef struct rdp_update rdpUpdate; #include #include #include -#include #include #include diff --git a/include/freerdp/utils/msusb.h b/include/freerdp/utils/msusb.h index f5ce47d2a..01af385ad 100644 --- a/include/freerdp/utils/msusb.h +++ b/include/freerdp/utils/msusb.h @@ -24,7 +24,7 @@ #include #include -#include +#include /* a safer free helper */ #define zfree(p) do { if (p != NULL) {free(p); p = NULL;} } while (0) diff --git a/include/freerdp/utils/rail.h b/include/freerdp/utils/rail.h index bd1a7da8b..7944538c2 100644 --- a/include/freerdp/utils/rail.h +++ b/include/freerdp/utils/rail.h @@ -22,7 +22,8 @@ #include #include -#include + +#include #ifdef __cplusplus extern "C" { diff --git a/include/freerdp/utils/stream.h b/include/freerdp/utils/stream.h deleted file mode 100644 index 36deb66c1..000000000 --- a/include/freerdp/utils/stream.h +++ /dev/null @@ -1,32 +0,0 @@ -/** - * FreeRDP: A Remote Desktop Protocol Implementation - * Stream Utils - * - * Copyright 2009-2011 Jay Sorg - * Copyright 2011 Vic Lee - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef FREERDP_UTILS_STREAM_H -#define FREERDP_UTILS_STREAM_H - -#include - -#include -#include - -#include - -#endif /* FREERDP_UTILS_STREAM_H */ - diff --git a/include/freerdp/utils/string.h b/include/freerdp/utils/string.h index 18261ab46..d91e88677 100644 --- a/include/freerdp/utils/string.h +++ b/include/freerdp/utils/string.h @@ -22,7 +22,8 @@ #include #include -#include + +#include struct rdp_string { diff --git a/include/freerdp/utils/svc_plugin.h b/include/freerdp/utils/svc_plugin.h index 443349a70..37a08f59e 100644 --- a/include/freerdp/utils/svc_plugin.h +++ b/include/freerdp/utils/svc_plugin.h @@ -30,11 +30,11 @@ #include #include #include +#include #include #include #include -#include typedef struct rdp_svc_plugin rdpSvcPlugin; diff --git a/libfreerdp/cache/bitmap.c b/libfreerdp/cache/bitmap.c index 2ed6bfaa3..3ee495308 100644 --- a/libfreerdp/cache/bitmap.c +++ b/libfreerdp/cache/bitmap.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include diff --git a/libfreerdp/cache/brush.c b/libfreerdp/cache/brush.c index fa8464af7..a01e0b0d3 100644 --- a/libfreerdp/cache/brush.c +++ b/libfreerdp/cache/brush.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include diff --git a/libfreerdp/cache/cache.c b/libfreerdp/cache/cache.c index a4e47d1d2..bc6563f17 100644 --- a/libfreerdp/cache/cache.c +++ b/libfreerdp/cache/cache.c @@ -23,7 +23,7 @@ #include -#include +#include #include diff --git a/libfreerdp/cache/glyph.c b/libfreerdp/cache/glyph.c index 7b56ed29b..f0419eedc 100644 --- a/libfreerdp/cache/glyph.c +++ b/libfreerdp/cache/glyph.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include diff --git a/libfreerdp/cache/nine_grid.c b/libfreerdp/cache/nine_grid.c index e4de9deff..e888f3adf 100644 --- a/libfreerdp/cache/nine_grid.c +++ b/libfreerdp/cache/nine_grid.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include diff --git a/libfreerdp/cache/offscreen.c b/libfreerdp/cache/offscreen.c index 4a696c0bf..2695a6913 100644 --- a/libfreerdp/cache/offscreen.c +++ b/libfreerdp/cache/offscreen.c @@ -25,7 +25,7 @@ #include -#include +#include #include diff --git a/libfreerdp/cache/pointer.c b/libfreerdp/cache/pointer.c index c0765be5e..a125b1610 100644 --- a/libfreerdp/cache/pointer.c +++ b/libfreerdp/cache/pointer.c @@ -25,7 +25,7 @@ #include -#include +#include #include diff --git a/libfreerdp/codec/bitmap.c b/libfreerdp/codec/bitmap.c index 34deb6bb8..598017081 100644 --- a/libfreerdp/codec/bitmap.c +++ b/libfreerdp/codec/bitmap.c @@ -21,7 +21,7 @@ #include "config.h" #endif -#include +#include #include #include diff --git a/libfreerdp/codec/jpeg.c b/libfreerdp/codec/jpeg.c index 39174d76d..784b5a7df 100644 --- a/libfreerdp/codec/jpeg.c +++ b/libfreerdp/codec/jpeg.c @@ -21,7 +21,7 @@ #include "config.h" #endif -#include +#include #include diff --git a/libfreerdp/codec/rfx_decode.c b/libfreerdp/codec/rfx_decode.c index 0f2ea6ff6..15aa4cf00 100644 --- a/libfreerdp/codec/rfx_decode.c +++ b/libfreerdp/codec/rfx_decode.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include "rfx_types.h" diff --git a/libfreerdp/core/capabilities.h b/libfreerdp/core/capabilities.h index 8a99d9a91..1ba4f91f1 100644 --- a/libfreerdp/core/capabilities.h +++ b/libfreerdp/core/capabilities.h @@ -25,7 +25,8 @@ #include #include #include -#include + +#include /* Capability Set Types */ #define CAPSET_TYPE_GENERAL 0x0001 diff --git a/libfreerdp/core/certificate.h b/libfreerdp/core/certificate.h index f03c2d56f..5008bb46d 100644 --- a/libfreerdp/core/certificate.h +++ b/libfreerdp/core/certificate.h @@ -26,8 +26,9 @@ #include #include -#include + #include +#include /* Certificate Version */ #define CERT_CHAIN_VERSION_1 0x00000001 diff --git a/libfreerdp/core/channel.c b/libfreerdp/core/channel.c index 6c824d573..32dde73a7 100644 --- a/libfreerdp/core/channel.c +++ b/libfreerdp/core/channel.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "rdp.h" #include "channel.h" diff --git a/libfreerdp/core/fastpath.c b/libfreerdp/core/fastpath.c index 5279a0ba8..3bef6abab 100644 --- a/libfreerdp/core/fastpath.c +++ b/libfreerdp/core/fastpath.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include "orders.h" #include "update.h" diff --git a/libfreerdp/core/fastpath.h b/libfreerdp/core/fastpath.h index 126b78f47..e7bcab46c 100644 --- a/libfreerdp/core/fastpath.h +++ b/libfreerdp/core/fastpath.h @@ -21,7 +21,8 @@ #define __FASTPATH_H #include "rdp.h" -#include + +#include typedef struct rdp_fastpath rdpFastPath; diff --git a/libfreerdp/core/gateway/ncacn_http.h b/libfreerdp/core/gateway/ncacn_http.h index 80e84c2f8..9c1d54ce1 100644 --- a/libfreerdp/core/gateway/ncacn_http.h +++ b/libfreerdp/core/gateway/ncacn_http.h @@ -27,7 +27,8 @@ #include #include -#include + +#include #include "rpc.h" diff --git a/libfreerdp/core/gateway/ntlm.h b/libfreerdp/core/gateway/ntlm.h index 073b3f0dc..257e84b05 100644 --- a/libfreerdp/core/gateway/ntlm.h +++ b/libfreerdp/core/gateway/ntlm.h @@ -38,8 +38,10 @@ typedef struct rdp_ntlm_http rdpNtlmHttp; #include #include #include -#include + +#include #include +#include struct rdp_ntlm { diff --git a/libfreerdp/core/gateway/rpc.h b/libfreerdp/core/gateway/rpc.h index 1bfee5584..d10d665c7 100644 --- a/libfreerdp/core/gateway/rpc.h +++ b/libfreerdp/core/gateway/rpc.h @@ -77,7 +77,6 @@ typedef struct _RPC_PDU #include #include #include -#include #include /** diff --git a/libfreerdp/core/gcc.h b/libfreerdp/core/gcc.h index 5958d9966..3432656b8 100644 --- a/libfreerdp/core/gcc.h +++ b/libfreerdp/core/gcc.h @@ -21,11 +21,13 @@ #define FREERDP_CORE_GCC_H #include "mcs.h" + #include #include #include -#include + +#include BOOL gcc_read_conference_create_request(wStream* s, rdpSettings* settings); void gcc_write_conference_create_request(wStream* s, wStream* user_data); diff --git a/libfreerdp/core/info.h b/libfreerdp/core/info.h index e30db35f4..21ceac3c0 100644 --- a/libfreerdp/core/info.h +++ b/libfreerdp/core/info.h @@ -23,7 +23,8 @@ #include "rdp.h" #include -#include + +#include /* Client Address Family */ #define ADDRESS_FAMILY_INET 0x0002 diff --git a/libfreerdp/core/input.h b/libfreerdp/core/input.h index 25b33fc68..22f8501c9 100644 --- a/libfreerdp/core/input.h +++ b/libfreerdp/core/input.h @@ -26,7 +26,8 @@ #include #include -#include + +#include /* Input Events */ #define INPUT_EVENT_SYNC 0x0000 diff --git a/libfreerdp/core/license.h b/libfreerdp/core/license.h index 0b05d4b2a..423b85a3f 100644 --- a/libfreerdp/core/license.h +++ b/libfreerdp/core/license.h @@ -23,12 +23,14 @@ typedef struct rdp_license rdpLicense; #include "rdp.h" + #include #include #include #include -#include + +#include /* Licensing Packet Types */ diff --git a/libfreerdp/core/mcs.h b/libfreerdp/core/mcs.h index a20be8349..1006231a7 100644 --- a/libfreerdp/core/mcs.h +++ b/libfreerdp/core/mcs.h @@ -21,10 +21,12 @@ #define __MCS_H #include "transport.h" + #include #include -#include + +#include #define MCS_BASE_CHANNEL_ID 1001 #define MCS_GLOBAL_CHANNEL_ID 1003 diff --git a/libfreerdp/core/nego.h b/libfreerdp/core/nego.h index 0ab267e67..48e3d0410 100644 --- a/libfreerdp/core/nego.h +++ b/libfreerdp/core/nego.h @@ -21,10 +21,12 @@ #define FREERDP_CORE_NEGO_H #include "transport.h" + #include #include #include -#include + +#include /* Protocol Security Negotiation Protocols */ enum RDP_NEG_PROTOCOLS diff --git a/libfreerdp/core/nla.h b/libfreerdp/core/nla.h index c23dc01e4..5a4baa299 100644 --- a/libfreerdp/core/nla.h +++ b/libfreerdp/core/nla.h @@ -24,9 +24,9 @@ typedef struct rdp_credssp rdpCredssp; #include #include -#include #include +#include #include #include diff --git a/libfreerdp/core/orders.h b/libfreerdp/core/orders.h index 1199ae209..d8f807394 100644 --- a/libfreerdp/core/orders.h +++ b/libfreerdp/core/orders.h @@ -21,9 +21,11 @@ #define __ORDERS_H #include "rdp.h" + #include #include -#include + +#include /* Order Control Flags */ #define ORDER_STANDARD 0x01 diff --git a/libfreerdp/core/rdp.h b/libfreerdp/core/rdp.h index 0046d072a..a8128c2ee 100644 --- a/libfreerdp/core/rdp.h +++ b/libfreerdp/core/rdp.h @@ -44,10 +44,11 @@ #include #include #include -#include #include #include +#include + /* Security Header Flags */ #define SEC_EXCHANGE_PKT 0x0001 #define SEC_ENCRYPT 0x0008 diff --git a/libfreerdp/core/redirection.h b/libfreerdp/core/redirection.h index 94ea4dee2..bc1309bd8 100644 --- a/libfreerdp/core/redirection.h +++ b/libfreerdp/core/redirection.h @@ -24,9 +24,10 @@ #include #include -#include #include +#include + struct rdp_redirection { UINT32 flags; diff --git a/libfreerdp/core/security.h b/libfreerdp/core/security.h index d02741d4e..ffcebdfdd 100644 --- a/libfreerdp/core/security.h +++ b/libfreerdp/core/security.h @@ -24,7 +24,8 @@ #include #include -#include + +#include void security_master_secret(const BYTE* premaster_secret, const BYTE* client_random, const BYTE* server_random, BYTE* output); void security_session_key_blob(const BYTE* master_secret, const BYTE* client_random, const BYTE* server_random, BYTE* output); diff --git a/libfreerdp/core/surface.h b/libfreerdp/core/surface.h index 96ddad7c5..f415a9d7b 100644 --- a/libfreerdp/core/surface.h +++ b/libfreerdp/core/surface.h @@ -21,7 +21,8 @@ #define __SURFACE #include "rdp.h" -#include + +#include #define SURFCMD_SURFACE_BITS_HEADER_LENGTH 22 #define SURFCMD_FRAME_MARKER_LENGTH 8 diff --git a/libfreerdp/core/tcp.c b/libfreerdp/core/tcp.c index 978bf0e11..c9d8e69bf 100644 --- a/libfreerdp/core/tcp.c +++ b/libfreerdp/core/tcp.c @@ -53,7 +53,7 @@ #include #include -#include +#include #include "tcp.h" diff --git a/libfreerdp/core/tcp.h b/libfreerdp/core/tcp.h index 62ebec617..baede4524 100644 --- a/libfreerdp/core/tcp.h +++ b/libfreerdp/core/tcp.h @@ -25,7 +25,8 @@ #include #include -#include + +#include #ifndef MSG_NOSIGNAL #define MSG_NOSIGNAL 0 diff --git a/libfreerdp/core/timezone.h b/libfreerdp/core/timezone.h index 5c744abce..076a4bed5 100644 --- a/libfreerdp/core/timezone.h +++ b/libfreerdp/core/timezone.h @@ -27,9 +27,10 @@ #endif #include -#include #include +#include + void rdp_read_system_time(wStream* s, SYSTEM_TIME* system_time); void rdp_write_system_time(wStream* s, SYSTEM_TIME* system_time); void rdp_get_client_time_zone(wStream* s, rdpSettings* settings); diff --git a/libfreerdp/core/tpdu.h b/libfreerdp/core/tpdu.h index 01b8e4dc6..dbd0fe53d 100644 --- a/libfreerdp/core/tpdu.h +++ b/libfreerdp/core/tpdu.h @@ -20,7 +20,7 @@ #ifndef __TPDU_H #define __TPDU_H -#include +#include enum X224_TPDU_TYPE { diff --git a/libfreerdp/core/tpkt.h b/libfreerdp/core/tpkt.h index 9620e9ebd..af984c11c 100644 --- a/libfreerdp/core/tpkt.h +++ b/libfreerdp/core/tpkt.h @@ -23,7 +23,7 @@ #include "tpdu.h" #include "transport.h" -#include +#include #define TPKT_HEADER_LENGTH 4 diff --git a/libfreerdp/core/transport.c b/libfreerdp/core/transport.c index 273cf3e3b..2d2a384d3 100644 --- a/libfreerdp/core/transport.c +++ b/libfreerdp/core/transport.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/libfreerdp/core/transport.h b/libfreerdp/core/transport.h index 60b672b25..909a70d45 100644 --- a/libfreerdp/core/transport.h +++ b/libfreerdp/core/transport.h @@ -43,7 +43,8 @@ typedef struct rdp_transport rdpTransport; #include #include #include -#include + +#include typedef int (*TransportRecv) (rdpTransport* transport, wStream* stream, void* extra); diff --git a/libfreerdp/core/update.h b/libfreerdp/core/update.h index 540ccc8ae..c3088f299 100644 --- a/libfreerdp/core/update.h +++ b/libfreerdp/core/update.h @@ -22,10 +22,12 @@ #include "rdp.h" #include "orders.h" + #include #include #include -#include + +#include #define UPDATE_TYPE_ORDERS 0x0000 #define UPDATE_TYPE_BITMAP 0x0001 diff --git a/libfreerdp/core/window.h b/libfreerdp/core/window.h index 2f8647643..b32e470ac 100644 --- a/libfreerdp/core/window.h +++ b/libfreerdp/core/window.h @@ -23,7 +23,7 @@ #include "update.h" -#include +#include BOOL update_recv_altsec_window_order(rdpUpdate* update, wStream* s); diff --git a/libfreerdp/crypto/ber.c b/libfreerdp/crypto/ber.c index 8a15d5dcb..24c5564f6 100644 --- a/libfreerdp/crypto/ber.c +++ b/libfreerdp/crypto/ber.c @@ -22,6 +22,8 @@ #endif #include +#include + #include BOOL ber_read_length(wStream* s, int* length) diff --git a/libfreerdp/crypto/der.c b/libfreerdp/crypto/der.c index 6f6d11f9a..7c4694f17 100644 --- a/libfreerdp/crypto/der.c +++ b/libfreerdp/crypto/der.c @@ -21,6 +21,8 @@ #include "config.h" #endif +#include + #include int _der_skip_length(int length) diff --git a/libfreerdp/crypto/er.c b/libfreerdp/crypto/er.c index 9f9adeb77..612752221 100644 --- a/libfreerdp/crypto/er.c +++ b/libfreerdp/crypto/er.c @@ -22,6 +22,8 @@ #include "config.h" #endif +#include + #include #include #include diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c index 56d2e4759..3da9b13ec 100644 --- a/libfreerdp/crypto/tls.c +++ b/libfreerdp/crypto/tls.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/libfreerdp/rail/icon.c b/libfreerdp/rail/icon.c index 15ca11412..856fa6952 100644 --- a/libfreerdp/rail/icon.c +++ b/libfreerdp/rail/icon.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include diff --git a/libfreerdp/rail/rail.c b/libfreerdp/rail/rail.c index ae11d79a9..e3c994621 100644 --- a/libfreerdp/rail/rail.c +++ b/libfreerdp/rail/rail.c @@ -23,7 +23,7 @@ #include -#include +#include #include "librail.h" diff --git a/libfreerdp/rail/window.c b/libfreerdp/rail/window.c index 35a55e3b7..2be703858 100644 --- a/libfreerdp/rail/window.c +++ b/libfreerdp/rail/window.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include "librail.h" diff --git a/libfreerdp/rail/window_list.c b/libfreerdp/rail/window_list.c index da27d8f9a..9fcbd2db8 100644 --- a/libfreerdp/rail/window_list.c +++ b/libfreerdp/rail/window_list.c @@ -23,7 +23,7 @@ #include -#include +#include #include "librail.h" diff --git a/libfreerdp/utils/CMakeLists.txt b/libfreerdp/utils/CMakeLists.txt index 55b3b7e46..bbea9ed96 100644 --- a/libfreerdp/utils/CMakeLists.txt +++ b/libfreerdp/utils/CMakeLists.txt @@ -29,7 +29,6 @@ set(${MODULE_PREFIX}_SRCS rail.c signal.c stopwatch.c - stream.c string.c svc_plugin.c tcp.c diff --git a/libfreerdp/utils/stream.c b/libfreerdp/utils/stream.c deleted file mode 100644 index 73503324c..000000000 --- a/libfreerdp/utils/stream.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * FreeRDP: A Remote Desktop Protocol Implementation - * Stream Utils - * - * Copyright 2011 Vic Lee - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -#include - - diff --git a/libfreerdp/utils/svc_plugin.c b/libfreerdp/utils/svc_plugin.c index f9a6317d5..1d39b1f26 100644 --- a/libfreerdp/utils/svc_plugin.c +++ b/libfreerdp/utils/svc_plugin.c @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include diff --git a/server/Mac/mf_interface.h b/server/Mac/mf_interface.h index c2bfc0ef9..cf383ad89 100644 --- a/server/Mac/mf_interface.h +++ b/server/Mac/mf_interface.h @@ -26,7 +26,8 @@ #include #include #include -#include + +#include //#ifdef WITH_SERVER_CHANNELS #include @@ -101,4 +102,4 @@ struct mf_info BOOL force_all_disconnect; }; -#endif \ No newline at end of file +#endif diff --git a/server/Mac/mf_peer.c b/server/Mac/mf_peer.c index 2cc843376..3577604c0 100644 --- a/server/Mac/mf_peer.c +++ b/server/Mac/mf_peer.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include diff --git a/server/Windows/wf_peer.c b/server/Windows/wf_peer.c index 42b6f2c20..0997daf9b 100644 --- a/server/Windows/wf_peer.c +++ b/server/Windows/wf_peer.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include "wf_info.h" #include "wf_input.h" diff --git a/server/X11/xf_peer.h b/server/X11/xf_peer.h index e5f637e6a..53135baa2 100644 --- a/server/X11/xf_peer.h +++ b/server/X11/xf_peer.h @@ -21,6 +21,7 @@ #define __XF_PEER_H #include +#include #include #include @@ -28,7 +29,6 @@ #include #include #include -#include #include typedef struct xf_peer_context xfPeerContext;