From 837cc777cec41ae340ed42f1d37c8190c4ec765b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Mon, 8 Oct 2012 20:33:58 -0400 Subject: [PATCH] channels: move include/freerdp/plugins to include/freerdp/client --- channels/cliprdr/client/cliprdr_format.c | 2 +- channels/cliprdr/client/cliprdr_main.c | 2 +- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 2 +- channels/tsmf/client/tsmf_media.c | 2 +- client/DirectFB/dfreerdp.c | 2 +- client/Mac/MRDPView.h | 2 +- client/Sample/freerdp.c | 5 +++-- client/Windows/wf_cliprdr.c | 2 +- client/X11/xf_cliprdr.c | 2 +- client/X11/xf_tsmf.c | 2 +- client/X11/xfreerdp.c | 2 +- cunit/test_cliprdr.c | 2 +- include/CMakeLists.txt | 1 - include/freerdp/{plugins => client}/cliprdr.h | 0 include/freerdp/{plugins => client}/tsmf.h | 0 libfreerdp/utils/event.c | 4 ++-- 16 files changed, 16 insertions(+), 16 deletions(-) rename include/freerdp/{plugins => client}/cliprdr.h (100%) rename include/freerdp/{plugins => client}/tsmf.h (100%) diff --git a/channels/cliprdr/client/cliprdr_format.c b/channels/cliprdr/client/cliprdr_format.c index 1d9b2865b..9d4e0a0f9 100644 --- a/channels/cliprdr/client/cliprdr_format.c +++ b/channels/cliprdr/client/cliprdr_format.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include "cliprdr_constants.h" #include "cliprdr_main.h" diff --git a/channels/cliprdr/client/cliprdr_main.c b/channels/cliprdr/client/cliprdr_main.c index dd1a849e3..6670b75ff 100644 --- a/channels/cliprdr/client/cliprdr_main.c +++ b/channels/cliprdr/client/cliprdr_main.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include "cliprdr_constants.h" #include "cliprdr_main.h" diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c index a4dbe8113..9d22e0692 100644 --- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c +++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include "tsmf_constants.h" diff --git a/channels/tsmf/client/tsmf_media.c b/channels/tsmf/client/tsmf_media.c index 58568b958..d07c1926e 100644 --- a/channels/tsmf/client/tsmf_media.c +++ b/channels/tsmf/client/tsmf_media.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include diff --git a/client/DirectFB/dfreerdp.c b/client/DirectFB/dfreerdp.c index ae80dafd6..de8af601e 100644 --- a/client/DirectFB/dfreerdp.c +++ b/client/DirectFB/dfreerdp.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include diff --git a/client/Mac/MRDPView.h b/client/Mac/MRDPView.h index 48a3aac4d..46c281399 100644 --- a/client/Mac/MRDPView.h +++ b/client/Mac/MRDPView.h @@ -15,7 +15,7 @@ #import "freerdp/gdi/gdi.h" #import "freerdp/graphics.h" #import "freerdp/utils/event.h" -#import "freerdp/plugins/cliprdr.h" +#import "freerdp/client/cliprdr.h" #import "freerdp/utils/args.h" #import "freerdp/rail/rail.h" #import "freerdp/rail.h" diff --git a/client/Sample/freerdp.c b/client/Sample/freerdp.c index 76d3ca55a..6ca1d5309 100644 --- a/client/Sample/freerdp.c +++ b/client/Sample/freerdp.c @@ -34,13 +34,14 @@ #include #include #include + +#include #include #include #include #include -#include +#include #include -#include #include diff --git a/client/Windows/wf_cliprdr.c b/client/Windows/wf_cliprdr.c index ca277bc2c..09b2511fb 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 01a9aa844..48ae47d7f 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/client/X11/xf_tsmf.c b/client/X11/xf_tsmf.c index 61e5e4382..07524072d 100644 --- a/client/X11/xf_tsmf.c +++ b/client/X11/xf_tsmf.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include "xf_tsmf.h" diff --git a/client/X11/xfreerdp.c b/client/X11/xfreerdp.c index f63fb4cdc..83cb672f2 100644 --- a/client/X11/xfreerdp.c +++ b/client/X11/xfreerdp.c @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #ifdef WITH_STATIC_PLUGINS diff --git a/cunit/test_cliprdr.c b/cunit/test_cliprdr.c index 26cf6f0f8..233cd9ed7 100644 --- a/cunit/test_cliprdr.c +++ b/cunit/test_cliprdr.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "test_cliprdr.h" diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 390b28bda..86fe07148 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -25,7 +25,6 @@ install(DIRECTORY freerdp/codec DESTINATION include/freerdp FILES_MATCHING PATTE install(DIRECTORY freerdp/crypto DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") install(DIRECTORY freerdp/gdi DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") install(DIRECTORY freerdp/locale DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/plugins DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") install(DIRECTORY freerdp/rail DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") install(DIRECTORY freerdp/utils DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") install(DIRECTORY freerdp/client DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") diff --git a/include/freerdp/plugins/cliprdr.h b/include/freerdp/client/cliprdr.h similarity index 100% rename from include/freerdp/plugins/cliprdr.h rename to include/freerdp/client/cliprdr.h diff --git a/include/freerdp/plugins/tsmf.h b/include/freerdp/client/tsmf.h similarity index 100% rename from include/freerdp/plugins/tsmf.h rename to include/freerdp/client/tsmf.h diff --git a/libfreerdp/utils/event.c b/libfreerdp/utils/event.c index f559b3f21..95c184681 100644 --- a/libfreerdp/utils/event.c +++ b/libfreerdp/utils/event.c @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include static RDP_EVENT* freerdp_cliprdr_event_new(uint16 event_type)