From 21c747d1c8d4f2f488454d01884b865754170c64 Mon Sep 17 00:00:00 2001
From: Hanhui <sylixos@gmail.com>
Date: Mon, 11 Mar 2019 20:26:56 +0800
Subject: [PATCH] Make vxWorksCommon.h not include vxTypes.h.

---
 target/h/types/vxTypes.h | 7 -------
 target/h/vxWorksCommon.h | 8 +++++++-
 target/src/vxWorks.c     | 2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/target/h/types/vxTypes.h b/target/h/types/vxTypes.h
index 94dba34..071e9d5 100644
--- a/target/h/types/vxTypes.h
+++ b/target/h/types/vxTypes.h
@@ -51,13 +51,6 @@ _TYPE_quad_t;
 #undef _TYPE_quad_t
 #endif
 
-/* Type for arbitrary user-supplied argument to a user-supplied routine. */
-#ifdef _WRS_CONFIG_LP64
-typedef long    _Vx_usr_arg_t;
-#else
-typedef int     _Vx_usr_arg_t;
-#endif /* _WRS_CONFIG_LP64 */
-
 typedef unsigned long      _Vx_ticks_t;
 typedef unsigned long long _Vx_ticks64_t;
 
diff --git a/target/h/vxWorksCommon.h b/target/h/vxWorksCommon.h
index 67d4d4c..90b261b 100644
--- a/target/h/vxWorksCommon.h
+++ b/target/h/vxWorksCommon.h
@@ -14,7 +14,6 @@
 #define __VXWORKS_VXWORKSCOMMON_H
 
 #include <SylixOS.h>
-#include "types/vxTypes.h"
 
 #if !defined(EOF) || (EOF != (-1))
 #define EOF     (-1)
@@ -138,6 +137,13 @@ extern size_t vmPageSize;
 #define _WRS_CONFIG_LP64  1
 #endif
 
+/* Type for arbitrary user-supplied argument to a user-supplied routine. */
+#ifdef _WRS_CONFIG_LP64
+typedef long    _Vx_usr_arg_t;
+#else
+typedef int     _Vx_usr_arg_t;
+#endif /* _WRS_CONFIG_LP64 */
+
 #ifdef _WRS_KERNEL
 #include "version.h"    /* kernel version numbers */
 #endif
diff --git a/target/src/vxWorks.c b/target/src/vxWorks.c
index 38bd3df..8f9fb9c 100644
--- a/target/src/vxWorks.c
+++ b/target/src/vxWorks.c
@@ -84,7 +84,7 @@ LW_DESTRUCTOR_END(__vxWorksDeinit)
 /*
  * VxWorks system Clk Connect.
  */
-STATUS  sysClkConnect(FUNCPTR routine, int arg)
+STATUS  sysClkConnect(FUNCPTR routine, _Vx_usr_arg_t arg)
 {
     errno = ENOSYS;
     return  (ERROR);