unbreak. remove yk_ndef_st name and map both YKNDEF and YK_NDEF to ndef_st

diff --git a/ykcore/ykcore.h b/ykcore/ykcore.h
index 4c70b36b47091ccfd96dd16b45348d61f23b419e..79069f8d0a7f80509a3d6002147a128741a14373 100644 (file)
--- a/ykcore/ykcore.h
+++ b/ykcore/ykcore.h
@@ -62,7 +62,7 @@ typedef struct yk_config_st YK_CONFIG;        /* Configuration structure.
 typedef struct yk_nav_st YK_NAV;       /* Navigation structure.
                                           Other libraries provide access. */
 typedef struct yk_frame_st YK_FRAME;   /* Data frame for write operation */
-typedef struct yk_ndef_st YK_NDEF;
+typedef struct ndef_st YK_NDEF;
 
 /*************************************************************************
  *

diff --git a/ykcore/ykcore_lcl.h b/ykcore/ykcore_lcl.h
index 483e7c28d7e00f412a8469c26b922f8e67524b32..131fbc4d493c1b59ce908062183a17a940957bd6 100644 (file)
--- a/ykcore/ykcore_lcl.h
+++ b/ykcore/ykcore_lcl.h
@@ -39,7 +39,6 @@
 #define yk_config_st config_st
 #define yk_nav_st nav_st
 #define yk_frame_st frame_st
-#define yk_ndef_st ndef_st
 
 #include "ykcore.h"
 #include "ykdef.h"

diff --git a/ykcore/ykdef.h b/ykcore/ykdef.h
index 65dfa1e163c33926a2add8d74c02cf525a6b10fb..9f82e1169455f22d1918cc4350705c2411393205 100644 (file)
--- a/ykcore/ykdef.h
+++ b/ykcore/ykdef.h
@@ -177,6 +177,9 @@ struct config_st {
 /* NDEF structure */
 #define        NDEF_DATA_SIZE                  54
 
+/* backwards compatibility with version 1.7.0  */
+typedef struct ndef_st YKNDEF;
+
 struct ndef_st {
        unsigned char len;                              /* Payload length */
        unsigned char type;                             /* NDEF type specifier */