From b72c99cea5dfe1a702cbf4e9b3d584bb4aeb4516 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Wed, 17 Jul 2013 10:10:17 -0700
Subject: [PATCH] Move compat to generic, add winpr-stream.c.

---
 src/protocols/rdp/Makefile.am                 |  4 +-
 src/protocols/rdp/compat/winpr-stream.c       | 49 +++++++++++++++++++
 .../stream.h => compat/winpr-stream.h}        |  0
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 src/protocols/rdp/compat/winpr-stream.c
 rename src/protocols/rdp/{winpr-compat/stream.h => compat/winpr-stream.h} (100%)

diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index aa62913f..74d0f18d 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -91,7 +91,9 @@ noinst_HEADERS =                     \
 
 # Add compatibility layer for WinPR if not available
 if ! ENABLE_WINPR
-	noinst_HEADERS += winpr-compat/stream.h
+    noinst_HEADERS += compat/winpr-stream.h
+    guac_rdpsnd_la_SOURCES += compat/winpr-stream.c
+    guac_rdpdr_la_SOURCES += compat/winpr-stream.c
 endif
 
 # Compile OGG support if available
diff --git a/src/protocols/rdp/compat/winpr-stream.c b/src/protocols/rdp/compat/winpr-stream.c
new file mode 100644
index 00000000..a552f3c9
--- /dev/null
+++ b/src/protocols/rdp/compat/winpr-stream.c
@@ -0,0 +1,49 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is libguac-client-rdp.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael Jumper.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "winpr-stream.h"
+
+wStream* Stream_New(BYTE* buffer, size_t size) {
+    /* STUB */
+    return stream_new(size);
+}
+
+void Stream_Free(wStream* s, BOOL bFreeBuffer) {
+    /* STUB */
+}
+
+#endif
+
diff --git a/src/protocols/rdp/winpr-compat/stream.h b/src/protocols/rdp/compat/winpr-stream.h
similarity index 100%
rename from src/protocols/rdp/winpr-compat/stream.h
rename to src/protocols/rdp/compat/winpr-stream.h