Merge branch 'release/debian/1_5.3.0GA-1'HEADdebian/1_5.3.0GA-1master

1 files changed, 19 insertions, 22 deletions

diff --git a/app/bin/trackx.h b/app/bin/trackx.h
index 50fda1d..5e1bc88 100644
--- a/app/bin/trackx.h
+++ b/app/bin/trackx.h
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 
@@ -27,29 +27,26 @@
 #include "common.h"
 #include "track.h"
 
-struct extraData;
-
 typedef struct track_t {
-		struct track_t *next;
-		TRKINX_T index;
-		TRKTYP_T type;
-		unsigned int layer;
-		signed char scale;
-		BOOL_T modified:1;
-		BOOL_T deleted:1;
-		BOOL_T new:1;
-		unsigned int width:2;
-		unsigned int elevMode:2;
-		unsigned int bits:12;
-		EPINX_T endCnt;
-		trkEndPt_p endPt;
-		struct { float x; float y; } lo, hi;
-		struct extraData * extraData;
-		CSIZE_T extraSize;
-		DIST_T elev;
-		} track_t;
+	struct track_t *next;
+	TRKINX_T index;
+	TRKTYP_T type;
+	unsigned int layer;
+	signed char scale;
+	BOOL_T modified:1;
+	BOOL_T deleted:1;
+	BOOL_T new:1;
+	unsigned int width:2;
+	unsigned int elevMode:2;
+	unsigned int bits:14;	// Make sure all TB_ flags can fit
+	EPINX_T endCnt;
+	trkEndPt_p endPt;
+	struct { float x; float y; } lo, hi;
+	struct extraDataBase_t * extraData;
+	CSIZE_T extraSize;
+	DIST_T elev;
+} track_t;
 
 extern track_p to_first;
 extern track_p * to_last;
-#define TRK_ITERATE(TRK)		for (TRK=to_first; TRK!=NULL; TRK=TRK->next) if (!(TRK->deleted)) 
 #endif