Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #868, Use quotes for local includes #892

Merged
merged 1 commit into from
Mar 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/os/posix/inc/os-impl-tasks.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#ifndef OS_IMPL_TASKS_H
#define OS_IMPL_TASKS_H

#include <os-shared-task.h>
#include "os-shared-task.h"

#include "osconfig.h"
#include <pthread.h>
Expand Down
2 changes: 1 addition & 1 deletion src/os/posix/inc/os-posix.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
/*
* Use the global definitions from the shared layer
*/
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/****************************************************************************************
DEFINES
Expand Down
2 changes: 1 addition & 1 deletion src/os/rtems/inc/os-rtems.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include <rtems/malloc.h>
#include <rtems/rtems/intr.h>

#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/****************************************************************************************
DEFINES
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-binsem.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_BINSEM_H

#include "osapi-binsem.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/* other objects that have only an API name and no other data */
typedef struct
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_CLOCK_H

#include "osapi-clock.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/*
* Clock API low-level handlers
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-common.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_COMMON_H

#include "osapi-common.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/*
* A "magic number" that when written to the "ShutdownFlag" member
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-countsem.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_COUNTSEM_H

#include "osapi-countsem.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/* other objects that have only an API name and no other data */
typedef struct
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-dir.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_DIR_H

#include "osapi-dir.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/* directory objects */
typedef struct
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-errors.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#ifndef OS_SHARED_ERRORS_H
#define OS_SHARED_ERRORS_H

#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/* Mapping of integer error number to name */
typedef struct
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-file.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_FILE_H

#include "osapi-file.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

typedef struct
{
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-filesys.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_FILESYS_H

#include "osapi-filesys.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/**
* This flag will be set on the internal record to indicate
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-heap.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_HEAP_H

#include "osapi-heap.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/****************************************************************************************
MEMORY HEAP API LOW-LEVEL IMPLEMENTATION FUNCTIONS
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-idmap.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_IDMAP_H

#include "osapi-idmap.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

#define OS_OBJECT_ID_RESERVED ((osal_id_t) {0xFFFFFFFF})

Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-module.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_MODULE_H

#include "osapi-module.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

typedef enum
{
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-mutex.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_MUTEX_H

#include "osapi-mutex.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

typedef struct
{
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-network.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_NETWORK_H

#include "osapi-network.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/****************************************************************************************
NETWORK / SOCKET API LOW-LEVEL IMPLEMENTATION FUNCTIONS
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-printf.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_PRINTF_H

#include "osapi-printf.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/*
* Variables related to the console buffer.
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-queue.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_QUEUE_H

#include "osapi-queue.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

typedef struct
{
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-select.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_SELECT_H

#include "osapi-select.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/*
* Select API
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-shell.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_SHELL_H

#include "osapi-shell.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/****************************************************************************************
SHELL API LOW-LEVEL IMPLEMENTATION FUNCTIONS
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-sockets.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_SOCKETS_H

#include "osapi-sockets.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/*
* Sockets API abstraction layer
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-task.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_TASK_H

#include "osapi-task.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/*tasks */
typedef struct
Expand Down
4 changes: 2 additions & 2 deletions src/os/shared/inc/os-shared-time.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

#include "osapi-timer.h"

#include <os-shared-globaldefs.h>
#include <os-shared-idmap.h>
#include "os-shared-globaldefs.h"
#include "os-shared-idmap.h"

#define TIMECB_FLAG_DEDICATED_TIMEBASE 0x1

Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/inc/os-shared-timebase.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define OS_SHARED_TIMEBASE_H

#include "osapi-timebase.h"
#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

typedef struct
{
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/src/osapi-version.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
/****************************************************************************************
INCLUDE FILES
***************************************************************************************/
#include <osapi-version.h>
#include "osapi-version.h"

/*----------------------------------------------------------------
*
Expand Down
2 changes: 1 addition & 1 deletion src/os/vxworks/inc/os-vxworks.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include <semLib.h>
#include <errnoLib.h>

#include <os-shared-globaldefs.h>
#include "os-shared-globaldefs.h"

/****************************************************************************************
DEFINES
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define UT_ADAPTOR_PORTABLE_POSIX_FILES_H

#include "common_types.h"
#include <OCS_sys_types.h>
#include "OCS_sys_types.h"

OCS_uid_t UT_PortablePosixFileTest_GetSelfEUID(void);
OCS_gid_t UT_PortablePosixFileTest_GetSelfEGID(void);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "osconfig.h"
#include "ut-adaptor-portable-posix-files.h"

#include <os-impl-files.h>
#include "os-impl-files.h"

OCS_uid_t UT_PortablePosixFileTest_GetSelfEUID(void)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "osconfig.h"
#include "ut-adaptor-portable-posix-io.h"

#include <os-impl-io.h>
#include "os-impl-io.h"

void UT_PortablePosixIOTest_Set_Selectable(osal_index_t local_id, bool is_selectable)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "os-shared-select.h"
#include "os-shared-idmap.h"

#include <OCS_sys_select.h>
#include "OCS_sys_select.h"

void Test_OS_SelectSingle_Impl(void)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
#include "os-shared-printf.h"
#include "os-shared-idmap.h"

#include <OCS_stdio.h>
#include <OCS_bsp-impl.h>
#include "OCS_stdio.h"
#include "OCS_bsp-impl.h"

#define TEST_BUFFER_LEN 16

Expand Down
12 changes: 6 additions & 6 deletions src/unit-test-coverage/portable/src/coveragetest-posix-dirs.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
#include "os-shared-dir.h"
#include "os-shared-idmap.h"

#include <OCS_stdlib.h>
#include <OCS_dirent.h>
#include <OCS_unistd.h>
#include <OCS_fcntl.h>
#include <OCS_stat.h>
#include <OCS_errno.h>
#include "OCS_stdlib.h"
#include "OCS_dirent.h"
#include "OCS_unistd.h"
#include "OCS_fcntl.h"
#include "OCS_stat.h"
#include "OCS_errno.h"

void Test_OS_DirCreate_Impl(void)
{
Expand Down
12 changes: 6 additions & 6 deletions src/unit-test-coverage/portable/src/coveragetest-posix-files.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
#include "os-shared-file.h"
#include "os-shared-idmap.h"

#include <OCS_stdio.h>
#include <OCS_stdlib.h>
#include <OCS_unistd.h>
#include <OCS_fcntl.h>
#include <OCS_stat.h>
#include <OCS_errno.h>
#include "OCS_stdio.h"
#include "OCS_stdlib.h"
#include "OCS_unistd.h"
#include "OCS_fcntl.h"
#include "OCS_stat.h"
#include "OCS_errno.h"

void Test_OS_FileOpen_Impl(void)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "os-portable-coveragetest.h"
#include "os-shared-clock.h"

#include <OCS_time.h>
#include "OCS_time.h"

void Test_OS_GetLocalTime_Impl(void)
{
Expand Down
8 changes: 4 additions & 4 deletions src/unit-test-coverage/portable/src/coveragetest-posix-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "os-shared-idmap.h"
#include "os-shared-select.h"

#include <OCS_stdlib.h>
#include <OCS_unistd.h>
#include <OCS_fcntl.h>
#include <OCS_errno.h>
#include "OCS_stdlib.h"
#include "OCS_unistd.h"
#include "OCS_fcntl.h"
#include "OCS_errno.h"

void Test_OS_GenericClose_Impl(void)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
* Includes
*/

#include <utassert.h>
#include <uttest.h>
#include <utstubs.h>
#include "utassert.h"
#include "uttest.h"
#include "utstubs.h"

#include "os-shared-globaldefs.h"

Expand Down
2 changes: 1 addition & 1 deletion src/unit-test-coverage/shared/src/coveragetest-binsem.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "os-shared-coveragetest.h"
#include "os-shared-binsem.h"

#include <OCS_string.h>
#include "OCS_string.h"

/*
**********************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/unit-test-coverage/shared/src/coveragetest-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "os-shared-task.h"
#include "os-shared-timebase.h"

#include <OCS_stdlib.h>
#include "OCS_stdlib.h"

/*
** OS_CleanUpObject() is an internal helper function.
Expand Down
2 changes: 1 addition & 1 deletion src/unit-test-coverage/shared/src/coveragetest-countsem.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "os-shared-coveragetest.h"
#include "os-shared-countsem.h"

#include <OCS_string.h>
#include "OCS_string.h"

/*
**********************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/unit-test-coverage/shared/src/coveragetest-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "os-shared-file.h"
#include "os-shared-idmap.h"

#include <OCS_string.h>
#include "OCS_string.h"

/*
**********************************************************************************
Expand Down
Loading