Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
FORMUS3IC_LAS3
/
embb
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
10c29687
authored
Nov 08, 2016
by
Marcus Winter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed issue with vs2012
parent
fbde70f0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
base_c/include/embb/base/c/internal/atomic/atomic_variables.h
+2
-2
base_c/src/mutex.c
+1
-0
No files found.
base_c/include/embb/base/c/internal/atomic/atomic_variables.h
View file @
10c29687
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
{ \
{ \
volatile EMBB_ATOMIC_PARAMETER_TYPE_NATIVE internal_variable; \
volatile EMBB_ATOMIC_PARAMETER_TYPE_NATIVE internal_variable; \
embb_mutex_t internal_mutex; \
embb_mutex_t internal_mutex; \
uint32_t marker; \
volatile
uint32_t marker; \
} EMBB_CAT2(embb_atomic_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX);
} EMBB_CAT2(embb_atomic_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX);
#else
#else
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
typedef struct \
typedef struct \
{ \
{ \
volatile EMBB_ATOMIC_PARAMETER_TYPE_NATIVE internal_variable; \
volatile EMBB_ATOMIC_PARAMETER_TYPE_NATIVE internal_variable; \
uint32_t marker; \
volatile
uint32_t marker; \
} EMBB_CAT2(embb_atomic_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX);
} EMBB_CAT2(embb_atomic_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX);
#endif
#endif
...
...
base_c/src/mutex.c
View file @
10c29687
...
@@ -205,5 +205,6 @@ int embb_spin_unlock(embb_spinlock_t* spinlock) {
...
@@ -205,5 +205,6 @@ int embb_spin_unlock(embb_spinlock_t* spinlock) {
void
embb_spin_destroy
(
embb_spinlock_t
*
spinlock
)
{
void
embb_spin_destroy
(
embb_spinlock_t
*
spinlock
)
{
assert
(
NULL
!=
spinlock
);
assert
(
NULL
!=
spinlock
);
embb_spin_lock
(
spinlock
);
embb_atomic_destroy_int
(
&
spinlock
->
atomic_spin_variable_
);
embb_atomic_destroy_int
(
&
spinlock
->
atomic_spin_variable_
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment