build: fix compiler warnings

warning: redundant redeclaration
Tested with: 4.7.2 and 3.5.0-1~exp1

diff --git a/include/freerdp/crypto/ber.h b/include/freerdp/crypto/ber.h
index 546b19c..2834448 100644 (file)
--- a/include/freerdp/crypto/ber.h
+++ b/include/freerdp/crypto/ber.h
@@ -63,7 +63,6 @@ FREERDP_API BOOL ber_read_universal_tag(wStream* s, BYTE tag, BOOL pc);
 FREERDP_API int ber_write_universal_tag(wStream* s, BYTE tag, BOOL pc);
 FREERDP_API BOOL ber_read_application_tag(wStream* s, BYTE tag, int* length);
 FREERDP_API void ber_write_application_tag(wStream* s, BYTE tag, int length);
-FREERDP_API BOOL ber_read_application_tag(wStream* s, BYTE tag, int* length);
 FREERDP_API BOOL ber_read_enumerated(wStream* s, BYTE* enumerated, BYTE count);
 FREERDP_API void ber_write_enumerated(wStream* s, BYTE enumerated, BYTE count);
 FREERDP_API BOOL ber_read_contextual_tag(wStream* s, BYTE tag, int* length, BOOL pc);

diff --git a/include/freerdp/crypto/er.h b/include/freerdp/crypto/er.h
index 5fab63d..3f70fef 100644 (file)
--- a/include/freerdp/crypto/er.h
+++ b/include/freerdp/crypto/er.h
@@ -68,7 +68,6 @@ FREERDP_API BOOL er_read_universal_tag(wStream* s, BYTE tag, BOOL pc);
 FREERDP_API void er_write_universal_tag(wStream* s, BYTE tag, BOOL pc);
 FREERDP_API BOOL er_read_application_tag(wStream* s, BYTE tag, int* length);
 FREERDP_API void er_write_application_tag(wStream* s, BYTE tag, int length, BOOL flag);
-FREERDP_API BOOL er_read_application_tag(wStream* s, BYTE tag, int* length);
 FREERDP_API BOOL er_read_enumerated(wStream* s, BYTE* enumerated, BYTE count);
 FREERDP_API void er_write_enumerated(wStream* s, BYTE enumerated, BYTE count, BOOL flag);
 FREERDP_API BOOL er_read_contextual_tag(wStream* s, BYTE tag, int* length, BOOL pc);

diff --git a/libfreerdp/primitives/prim_YUV.c b/libfreerdp/primitives/prim_YUV.c
index 24ff1a4..a49fc38 100644 (file)
--- a/libfreerdp/primitives/prim_YUV.c
+++ b/libfreerdp/primitives/prim_YUV.c
@@ -24,7 +24,6 @@
 #include <freerdp/primitives.h>
 #include <freerdp/codec/color.h>
 
-#include "prim_internal.h"
 #include "prim_YUV.h"
 
 /**

diff --git a/rdtk/librdtk/rdtk_surface.h b/rdtk/librdtk/rdtk_surface.h
index efe7a87..196943e 100644 (file)
--- a/rdtk/librdtk/rdtk_surface.h
+++ b/rdtk/librdtk/rdtk_surface.h
@@ -33,17 +33,5 @@ struct rdtk_surface
        BYTE* data;
        BOOL owner;
 };
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-rdtkSurface* rdtk_surface_new(rdtkEngine* engine, BYTE* data, int width, int height, int scanline);
-void rdtk_surface_free(rdtkSurface* surface);
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* RDTK_SURFACE_PRIVATE_H */