Correcting a double definition of FRSH_MUTEXT_T_OPAQUE

git-svn-id: http://www.frescor.org/private/svn/frescor/frsh/trunk/include@674 35b4ef3e-fd22-0410-ab77-dab3279adceb

diff --git a/frsh.h b/frsh.h
index b7ace26095250b47b1c0344bce33230a826a8e54..a34004537928d7dcfebbb1f9d1377d671fb4219c 100644 (file)
--- a/frsh.h
+++ b/frsh.h
@@ -54,8 +54,7 @@
 //  License.  This exception does not however invalidate any other
 //  reasons why the executable file might be covered by the GNU General
 //  Public License.
-// -----------------------------------------------------------------------
-//frsh.h
+// ---------------------------------------------------------------------
 
 //==============================================
 //  ******** *******    ********  **      **

diff --git a/frsh_fosa_opaque.h b/frsh_fosa_opaque.h
index 46fdcf73ef73d70f93df7eaedf44094960074476..5a03fec26626c4ac534f3d1903117b35f20a7a4d 100644 (file)
--- a/frsh_fosa_opaque.h
+++ b/frsh_fosa_opaque.h
@@ -105,7 +105,6 @@ typedef struct {
 #else  /* !AQuoSA, MARTE_OS, RT_LINUX */
 
 #ifdef MARTE_OS
-#define FOSA_MUTEX_T_OPAQUE int
 typedef pthread_t FOSA_THREAD_ID_T_OPAQUE;
 #else
 //#define FOSA_MUTEX_T_OPAQUE pthread_mutex_t
@@ -118,7 +117,6 @@ typedef pthread_attr_t FOSA_THREAD_ATTR_T_OPAQUE;
 
 typedef int FOSA_SIGNAL_T_OPAQUE;
 
-
 typedef pthread_mutex_t FOSA_MUTEX_T_OPAQUE;
 
 // The minimum and maximum signal numbers that may be used by the FRSH