From: Klas Lindfors <klas@yubico.com>
Date: Thu, 20 Sep 2012 13:30:06 +0000 (+0200)
Subject: unbreak. remove yk_ndef_st name and map both YKNDEF and YK_NDEF to ndef_st
X-Git-Tag: v1.8.0~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b1a52687388c14e376db470a64453a1fa7fe1d5;p=yubikey-personalization

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 4c70b36..79069f8 100644
--- 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 483e7c2..131fbc4 100644
--- 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 65dfa1e..9f82e11 100644
--- 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 */