afreerdp: fix build warnings
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 22 Sep 2015 15:53:50 +0000 (11:53 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 22 Sep 2015 15:53:50 +0000 (11:53 -0400)
channels/drdynvc/client/drdynvc_main.c
client/Android/FreeRDPCore/jni/android_freerdp.c

index 73e3205..cfe8679 100644 (file)
@@ -49,7 +49,7 @@ static UINT dvcman_get_configuration(IWTSListener* pListener, void** ppPropertyB
  * @return 0 on success, otherwise a Win32 error code
  */
 static UINT dvcman_create_listener(IWTSVirtualChannelManager* pChannelMgr,
-       const char* pszChannelName, UINT32 ulFlags,
+       const char* pszChannelName, ULONG ulFlags,
        IWTSListenerCallback* pListenerCallback, IWTSListener** ppListener)
 {
        DVCMAN* dvcman = (DVCMAN*) pChannelMgr;
@@ -400,7 +400,7 @@ UINT dvcman_init(IWTSVirtualChannelManager* pChannelMgr)
  *
  * @return 0 on success, otherwise a Win32 error code
  */
-static UINT dvcman_write_channel(IWTSVirtualChannel* pChannel, UINT32 cbSize, BYTE* pBuffer, void* pReserved)
+static UINT dvcman_write_channel(IWTSVirtualChannel* pChannel, ULONG cbSize, BYTE* pBuffer, void* pReserved)
 {
        UINT status;
        DVCMAN_CHANNEL* channel = (DVCMAN_CHANNEL*) pChannel;
index 4fc47b5..01bc191 100644 (file)
@@ -328,7 +328,8 @@ static BOOL android_verify_certificate(freerdp* instance, char* subject, char* i
        return ((res == JNI_TRUE) ? TRUE : FALSE);
 }
 
-static BOOL android_verify_changed_certificate(freerdp* instance, char* subject, char* issuer, char* new_fingerprint, char* old_fingerprint)
+static BOOL android_verify_changed_certificate(freerdp* instance, char* subject, char* issuer,
+               char* new_fingerprint, char* old_subject, char* old_issuer, char* old_fingerprint)
 {
        return android_verify_certificate(instance, subject, issuer, new_fingerprint);
 }