Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
e3-require
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ESS EPICS Environment
wrappers
e3-require
Commits
696bfc81
Commit
696bfc81
authored
2 years ago
by
Anders Lindh Olsson
Browse files
Options
Downloads
Patches
Plain Diff
Improve cpp comments
parent
cedb1efb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!85
E3-670: Propose linters
Pipeline
#111485
failed
2 years ago
Stage: check
Stage: build
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
require-ess/src/require.c
+17
-19
17 additions, 19 deletions
require-ess/src/require.c
with
17 additions
and
19 deletions
require-ess/src/require.c
+
17
−
19
View file @
696bfc81
...
...
@@ -88,7 +88,7 @@ int requireDebug;
#define PREFIX
#define INFIX
#define EXT ".dll"
#else
#else
// CYGWIN32
#define PREFIX "lib"
#define INFIX
#define EXT ".so"
...
...
@@ -98,7 +98,7 @@ int requireDebug;
#ifndef OS_CLASS
#define OS_CLASS "WIN32"
#endif
#endif
// OS_CLASS
#include
<Psapi.h>
#include
<windows.h>
...
...
@@ -127,7 +127,7 @@ static char *realpath(const char *path, char *buffer) {
return
buffer
;
}
#else
#else
// defined(none)
#warning unknown OS
#define PREFIX
...
...
@@ -135,7 +135,7 @@ static char *realpath(const char *path, char *buffer) {
#define EXT
#define getAddress(module, name) NULL
#endif
#endif
// defined
/* for readdir: Windows or Posix */
#if defined(_WIN32)
...
...
@@ -156,7 +156,7 @@ static char *realpath(const char *path, char *buffer) {
continue;
#define FILENAME(e) e.cFileName
#else
#else
// defined(_WIN32)
#include
<dirent.h>
#define DIR_HANDLE DIR *
#define IF_OPEN_DIR(f) if ((dir = opendir(f)))
...
...
@@ -170,31 +170,29 @@ static char *realpath(const char *path, char *buffer) {
#ifdef _DIRENT_HAVE_D_TYPE
#define SKIP_NON_DIR(e) \
if (e->d_type != DT_DIR && e->d_type != DT_UNKNOWN) continue;
#else
#else
// _DIRENT_HAVE_D_TYPE
#define SKIP_NON_DIR(e)
#endif
#endif
// _DIRENT_HAVE_D_TYPE
#define FILENAME(e) e->d_name
#endif
#endif
// defined(_WIN32)
#define LIBDIR "lib" OSI_PATH_SEPARATOR
#define TEMPLATEDIR "db"
/*
#define TOSTR(s) TOSTR2(s)
#define TOSTR2(s) #s
const char epicsRelease[] =
TOSTR(EPICS_VERSION)"."TOSTR(EPICS_REVISION)"."TOSTR(EPICS_MODIFICATION);
// #define TOSTR(s) TOSTR2(s)
// #define TOSTR2(s) #s
// const char epicsRelease[] =
// TOSTR(EPICS_VERSION)"."TOSTR(EPICS_REVISION)"."TOSTR(EPICS_MODIFICATION);
#ifndef T_A
#error T_A not defined: Compile with USR_CFLAGS += -DT_A='"${T_A}"'
#endif
const char targetArch[] = T_A;
*/
// #ifndef T_A
// #error T_A not defined: Compile with USR_CFLAGS += -DT_A='"${T_A}"'
// #endif
// const char targetArch[] = T_A;
#ifndef OS_CLASS
#error OS_CLASS not defined: Try to compile with USR_CFLAGS += -DOS_CLASS='"${OS_CLASS}"'
#endif
#endif
// OS_CLASS
const
char
osClass
[]
=
OS_CLASS
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment