michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: posix: net: fix missing clock_t and clockid_t with newlib

Browse source 
Fix errors found in CI for missing clock_t and clockid_t types
when building the tests/posix/net testsuite against newlib.

Also use angle-brackets and prefixed path with
`<zephyr/posix/posix_types.h>` since it is not in the default
search path and is analagous to `<sys/types.h>`.

Signed-off-by: Chris Friedt <cfriedt@tenstorrent.com>
This commit is contained in:
Chris Friedt 2024-10-15 12:53:37 -04:00 • committed by Henrik Brix Andersen
commit b302212c5a
10 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/zephyr/posix/dirent.h
View file

@ -7,7 +7,8 @@
#define ZEPHYR_INCLUDE_POSIX_DIRENT_H_
#include <limits.h>
#include "posix_types.h"
#include <zephyr/posix/posix_types.h>
#ifdef CONFIG_POSIX_FILE_SYSTEM
#include <zephyr/fs/fs.h>

2
include/zephyr/posix/mqueue.h
View file

@ -12,7 +12,7 @@
#include <zephyr/posix/fcntl.h>
#include <zephyr/posix/signal.h>
#include <zephyr/posix/sys/stat.h>
#include "posix_types.h"
#include <zephyr/posix/posix_types.h>
#ifdef __cplusplus
extern "C" {

12
include/zephyr/posix/posix_types.h
View file

@ -11,6 +11,18 @@
#include <sys/types.h>
#endif
#if !defined(_CLOCK_T_DECLARED) && !defined(__clock_t_defined)
typedef unsigned long clock_t;
#define _CLOCK_T_DECLARED
#define __clock_t_defined
#endif
#if !defined(_CLOCKID_T_DECLARED) && !defined(__clockid_t_defined)
typedef unsigned long clockid_t;
#define _CLOCKID_T_DECLARED
#define __clockid_t_defined
#endif
#ifdef CONFIG_NEWLIB_LIBC
#include <sys/_pthreadtypes.h>
#endif

3
include/zephyr/posix/sched.h
View file

@ -7,8 +7,7 @@
#define ZEPHYR_INCLUDE_POSIX_SCHED_H_
#include <zephyr/kernel.h>
#include "posix_types.h"
#include <zephyr/posix/posix_types.h>
#include <time.h>

2
include/zephyr/posix/semaphore.h
View file

@ -7,7 +7,7 @@
#define ZEPHYR_INCLUDE_POSIX_SEMAPHORE_H_
#include <zephyr/posix/time.h>
#include "posix_types.h"
#include <zephyr/posix/posix_types.h>
#ifdef __cplusplus
extern "C" {

3
include/zephyr/posix/signal.h
View file

@ -6,7 +6,8 @@
#ifndef ZEPHYR_INCLUDE_POSIX_SIGNAL_H_
#define ZEPHYR_INCLUDE_POSIX_SIGNAL_H_
#include "posix_types.h"
/* include posix_types.h before posix_features.h (here) to avoid build errors against newlib */
#include <zephyr/posix/posix_types.h>
#include "posix_features.h"
#ifdef __cplusplus

1
include/zephyr/posix/sys/select.h
View file

@ -6,6 +6,7 @@
#ifndef ZEPHYR_INCLUDE_POSIX_SYS_SELECT_H_
#define ZEPHYR_INCLUDE_POSIX_SYS_SELECT_H_
#include <zephyr/posix/posix_types.h>
#include <zephyr/sys/fdtable.h>
#ifdef __cplusplus

2
include/zephyr/posix/time.h
View file

@ -58,7 +58,7 @@ struct itimerspec {
#include <zephyr/kernel.h>
#include <errno.h>
#include "posix_types.h"
#include <zephyr/posix/posix_types.h>
#include <zephyr/posix/signal.h>
#ifdef __cplusplus

2
include/zephyr/posix/unistd.h
View file

@ -6,7 +6,7 @@
#ifndef ZEPHYR_INCLUDE_POSIX_UNISTD_H_
#define ZEPHYR_INCLUDE_POSIX_UNISTD_H_
#include "posix_types.h"
#include <zephyr/posix/posix_types.h>
#ifdef CONFIG_POSIX_API
#include <zephyr/fs/fs.h>

2
tests/posix/net/CMakeLists.txt
View file

@ -7,3 +7,5 @@ project(posix_net)
FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources})
target_compile_options(app PRIVATE -U_POSIX_C_SOURCE -D_POSIX_C_SOURCE=200809L)