Browse Source

Make vxWorksCommon.h not include vxTypes.h.

master
Hanhui 6 years ago
parent
commit
21c747d1c8
  1. 7
      target/h/types/vxTypes.h
  2. 8
      target/h/vxWorksCommon.h
  3. 2
      target/src/vxWorks.c

7
target/h/types/vxTypes.h

@ -51,13 +51,6 @@ _TYPE_quad_t;
#undef _TYPE_quad_t #undef _TYPE_quad_t
#endif #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 _Vx_ticks_t;
typedef unsigned long long _Vx_ticks64_t; typedef unsigned long long _Vx_ticks64_t;

8
target/h/vxWorksCommon.h

@ -14,7 +14,6 @@
#define __VXWORKS_VXWORKSCOMMON_H #define __VXWORKS_VXWORKSCOMMON_H
#include <SylixOS.h> #include <SylixOS.h>
#include "types/vxTypes.h"
#if !defined(EOF) || (EOF != (-1)) #if !defined(EOF) || (EOF != (-1))
#define EOF (-1) #define EOF (-1)
@ -138,6 +137,13 @@ extern size_t vmPageSize;
#define _WRS_CONFIG_LP64 1 #define _WRS_CONFIG_LP64 1
#endif #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 #ifdef _WRS_KERNEL
#include "version.h" /* kernel version numbers */ #include "version.h" /* kernel version numbers */
#endif #endif

2
target/src/vxWorks.c

@ -84,7 +84,7 @@ LW_DESTRUCTOR_END(__vxWorksDeinit)
/* /*
* VxWorks system Clk Connect. * VxWorks system Clk Connect.
*/ */
STATUS sysClkConnect(FUNCPTR routine, int arg) STATUS sysClkConnect(FUNCPTR routine, _Vx_usr_arg_t arg)
{ {
errno = ENOSYS; errno = ENOSYS;
return (ERROR); return (ERROR);

Loading…
Cancel
Save