From ee4f79482acbc7fbdfcbdc643862965998c6f746 Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu>
Date: Mon, 19 Oct 2015 16:15:37 +0200
Subject: [PATCH] sem: rename to sema
To prevent name colisions with POSIX semaphores
---
Makefile.dep | 4 ++--
sys/Makefile | 4 ++--
sys/include/{sem.h => sema.h} | 0
sys/posix/include/semaphore.h | 2 +-
sys/posix/semaphore/posix_semaphore.c | 2 +-
sys/{sem => sema}/Makefile | 0
sys/{sem/sem.c => sema/sema.c} | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
rename sys/include/{sem.h => sema.h} (100%)
rename sys/{sem => sema}/Makefile (100%)
rename sys/{sem/sem.c => sema/sema.c} (99%)
diff --git a/Makefile.dep b/Makefile.dep
index 584830b6f4..c8f975e40f 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -283,11 +283,11 @@ ifneq (,$(filter posix,$(USEMODULE)))
endif
ifneq (,$(filter posix_semaphore,$(USEMODULE)))
- USEMODULE += sem
+ USEMODULE += sema
USEMODULE += vtimer
endif
-ifneq (,$(filter sem,$(USEMODULE)))
+ifneq (,$(filter sema,$(USEMODULE)))
USEMODULE += vtimer
endif
diff --git a/sys/Makefile b/sys/Makefile
index 8baba47737..226e3c02c6 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -71,8 +71,8 @@ endif
ifneq (,$(filter netopt,$(USEMODULE)))
DIRS += net/crosslayer/netopt
endif
-ifneq (,$(filter sem,$(USEMODULE)))
- DIRS += sem
+ifneq (,$(filter sema,$(USEMODULE)))
+ DIRS += sema
endif
DIRS += $(dir $(wildcard $(addsuffix /Makefile, ${USEMODULE})))
diff --git a/sys/include/sem.h b/sys/include/sema.h
similarity index 100%
rename from sys/include/sem.h
rename to sys/include/sema.h
diff --git a/sys/posix/include/semaphore.h b/sys/posix/include/semaphore.h
index cbf3fd64f9..1ffe83c1e4 100644
--- a/sys/posix/include/semaphore.h
+++ b/sys/posix/include/semaphore.h
@@ -26,7 +26,7 @@
#include <errno.h>
#include <time.h>
-#include "sem.h"
+#include "sema.h"
#ifdef __cplusplus
extern "C" {
diff --git a/sys/posix/semaphore/posix_semaphore.c b/sys/posix/semaphore/posix_semaphore.c
index 4e8d67893c..1076aae08a 100644
--- a/sys/posix/semaphore/posix_semaphore.c
+++ b/sys/posix/semaphore/posix_semaphore.c
@@ -21,7 +21,7 @@
#include "irq.h"
#include "sched.h"
-#include "sem.h"
+#include "sema.h"
#include "tcb.h"
#include "timex.h"
#include "thread.h"
diff --git a/sys/sem/Makefile b/sys/sema/Makefile
similarity index 100%
rename from sys/sem/Makefile
rename to sys/sema/Makefile
diff --git a/sys/sem/sem.c b/sys/sema/sema.c
similarity index 99%
rename from sys/sem/sem.c
rename to sys/sema/sema.c
index a4256069b7..0cc1cff90e 100644
--- a/sys/sem/sem.c
+++ b/sys/sema/sema.c
@@ -24,7 +24,7 @@
#include "msg.h"
#include "vtimer.h"
-#include "sem.h"
+#include "sema.h"
#define ENABLE_DEBUG (0)
#include "debug.h"
--
GitLab