From 25021dad7a1ed697ef7e5a2d06d1e43112a56a9d Mon Sep 17 00:00:00 2001
From: winckel <winckel@eurecom.fr>
Date: Thu, 16 Jan 2014 15:59:39 +0000
Subject: [PATCH] Removed duplicated definition of "instance_t" and its related
 defines.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4898 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
 common/utils/itti/intertask_interface_types.h | 6 +-----
 common/utils/itti/itti_types.h                | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/common/utils/itti/intertask_interface_types.h b/common/utils/itti/intertask_interface_types.h
index d2bc004545..019dd621e6 100644
--- a/common/utils/itti/intertask_interface_types.h
+++ b/common/utils/itti/intertask_interface_types.h
@@ -37,7 +37,7 @@
 #ifndef INTERTASK_INTERFACE_TYPES_H_
 #define INTERTASK_INTERFACE_TYPES_H_
 
-#include <stdint.h>
+#include "itti_types.h"
 
 /* Defines to handle bit fields on unsigned long values */
 #define UL_BIT_MASK(lENGTH)             ((1UL << (lENGTH)) - 1UL)
@@ -120,10 +120,6 @@ typedef union msg_s
 #undef MESSAGE_DEF
 } msg_t;
 
-#define INSTANCE_DEFAULT    (UINT16_MAX - 1)
-#define INSTANCE_ALL        (UINT16_MAX)
-
-typedef uint16_t instance_t;
 typedef uint16_t MessageHeaderSize;
 
 typedef struct itti_lte_time_s
diff --git a/common/utils/itti/itti_types.h b/common/utils/itti/itti_types.h
index 83e6cbeb7d..1ed1008fb9 100644
--- a/common/utils/itti/itti_types.h
+++ b/common/utils/itti/itti_types.h
@@ -36,6 +36,8 @@
 #ifndef _ITTI_TYPES_H_
 #define _ITTI_TYPES_H_
 
+#include <stdint.h>
+
 #define CHARS_TO_UINT32(c1, c2, c3, c4) (((c4) << 24) | ((c3) << 16) | ((c2) << 8) | (c1))
 
 #define MESSAGE_NUMBER_CHAR_FORMAT      "%11u"
-- 
GitLab