From 6e1a396aa4bf4e1ec48bff139c7dc5fb48de0a28 Mon Sep 17 00:00:00 2001
From: Armin Novak <armin.novak@thincast.com>
Date: Thu, 14 Nov 2019 15:15:30 +0100
Subject: [PATCH] rdpNineGridCache now opaque

---
 include/freerdp/cache/nine_grid.h | 22 ----------------------
 libfreerdp/cache/nine_grid.c      | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/include/freerdp/cache/nine_grid.h b/include/freerdp/cache/nine_grid.h
index 3b8e2b1..c10d571 100644
--- a/include/freerdp/cache/nine_grid.h
+++ b/include/freerdp/cache/nine_grid.h
@@ -27,32 +27,10 @@
 
 #include <winpr/stream.h>
 
-typedef struct _NINE_GRID_ENTRY NINE_GRID_ENTRY;
 typedef struct rdp_nine_grid_cache rdpNineGridCache;
 
 #include <freerdp/cache/cache.h>
 
-struct _NINE_GRID_ENTRY
-{
-	void* entry;
-};
-
-struct rdp_nine_grid_cache
-{
-	pDrawNineGrid DrawNineGrid;           /* 0 */
-	pMultiDrawNineGrid MultiDrawNineGrid; /* 1 */
-	UINT32 paddingA[16 - 2];              /* 2 */
-
-	UINT32 maxEntries;        /* 16 */
-	UINT32 maxSize;           /* 17 */
-	NINE_GRID_ENTRY* entries; /* 18 */
-	UINT32 paddingB[32 - 19]; /* 19 */
-
-	/* internal */
-
-	rdpSettings* settings;
-};
-
 #ifdef __cplusplus
 extern "C"
 {
diff --git a/libfreerdp/cache/nine_grid.c b/libfreerdp/cache/nine_grid.c
index e2953f4..33c1618 100644
--- a/libfreerdp/cache/nine_grid.c
+++ b/libfreerdp/cache/nine_grid.c
@@ -34,6 +34,28 @@
 
 #define TAG FREERDP_TAG("cache.nine_grid")
 
+struct _NINE_GRID_ENTRY
+{
+	void* entry;
+};
+typedef struct _NINE_GRID_ENTRY NINE_GRID_ENTRY;
+
+struct rdp_nine_grid_cache
+{
+	pDrawNineGrid DrawNineGrid;           /* 0 */
+	pMultiDrawNineGrid MultiDrawNineGrid; /* 1 */
+	UINT32 paddingA[16 - 2];              /* 2 */
+
+	UINT32 maxEntries;        /* 16 */
+	UINT32 maxSize;           /* 17 */
+	NINE_GRID_ENTRY* entries; /* 18 */
+	UINT32 paddingB[32 - 19]; /* 19 */
+
+	/* internal */
+
+	rdpSettings* settings;
+};
+
 static void* nine_grid_cache_get(rdpNineGridCache* nine_grid, UINT32 index);
 static void nine_grid_cache_put(rdpNineGridCache* nine_grid, UINT32 index, void* entry);
 
-- 
2.7.4