cunit: fixed build after directory structure changes

davidleake · Sep 10, 2012 · 533d9a7 · 533d9a7
1 parent 9f18c63
commit 533d9a7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/cunit/CMakeLists.txt b/cunit/CMakeLists.txt
@@ -20,10 +20,10 @@
 include_directories(${CUNIT_INCLUDE_DIRS})
 include_directories(${CMAKE_SOURCE_DIR}) # for some internal tests
 
-include_directories(../libfreerdp-core)
-include_directories(../libfreerdp-gdi)
-include_directories(../libfreerdp-cache)
-include_directories(../libfreerdp-codec)
+include_directories(../libfreerdp/core)
+include_directories(../libfreerdp/gdi)
+include_directories(../libfreerdp/cache)
+include_directories(../libfreerdp/codec)
 
 add_executable(test_freerdp
 	test_per.c

diff --git a/cunit/test_ntlm.c b/cunit/test_ntlm.c
@@ -23,9 +23,9 @@
 #include <winpr/sspi.h>
 #include <freerdp/freerdp.h>
 
-#include "winpr/sspi/NTLM/ntlm.h"
-#include "winpr/sspi/NTLM/ntlm_compute.h"
-#include "winpr/sspi/NTLM/ntlm_message.h"
+#include "winpr/libwinpr/sspi/NTLM/ntlm.h"
+#include "winpr/libwinpr/sspi/NTLM/ntlm_compute.h"
+#include "winpr/libwinpr/sspi/NTLM/ntlm_message.h"
 
 #include "test_ntlm.h"
 

diff --git a/cunit/test_orders.c b/cunit/test_orders.c
@@ -22,8 +22,8 @@
 #include <freerdp/utils/stream.h>
 
 #include "test_orders.h"
-#include "libfreerdp-core/orders.h"
-#include "libfreerdp-core/update.h"
+#include "libfreerdp/core/orders.h"
+#include "libfreerdp/core/update.h"
 
 ORDER_INFO* orderInfo;
 

diff --git a/cunit/test_sspi.c b/cunit/test_sspi.c
@@ -54,7 +54,7 @@ int add_sspi_suite(void)
 
 void test_EnumerateSecurityPackages(void)
 {
-	uint32 cPackages;
+	ULONG cPackages;
 	SECURITY_STATUS status;
 	SecPkgInfo* pPackageInfo;
 
@@ -64,7 +64,7 @@ void test_EnumerateSecurityPackages(void)
 	{
 		int index;
 
-		printf("\nEnumerateSecurityPackages (%d):\n", cPackages);
+		printf("\nEnumerateSecurityPackages (%d):\n", (unsigned int)cPackages);
 
 		for (index = 0; index < cPackages; index++)
 		{