[MERGED] libosmocore[master]: Always include <osmocom/core/talloc.h> and not <talloc.h>

Harald Welte gerrit-no-reply at lists.osmocom.org
Sun Jan 15 17:34:03 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: Always include <osmocom/core/talloc.h> and not <talloc.h>
......................................................................


Always include <osmocom/core/talloc.h> and not <talloc.h>

In EMBEDDED builds we don't have a system-wide talloc

Change-Id: Icc526016bda45b36e584afee8669996752d6d89c
---
M include/osmocom/core/bitvec.h
M src/ctrl/control_vty.c
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/core/bitvec.h b/include/osmocom/core/bitvec.h
index 0e17ba7..280039b 100644
--- a/include/osmocom/core/bitvec.h
+++ b/include/osmocom/core/bitvec.h
@@ -41,7 +41,7 @@
  */
 
 #include <stdint.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 #include <stdbool.h>
 
 /*! \brief A single GSM bit
diff --git a/src/ctrl/control_vty.c b/src/ctrl/control_vty.c
index 7acb973..a67dbe2 100644
--- a/src/ctrl/control_vty.c
+++ b/src/ctrl/control_vty.c
@@ -21,7 +21,7 @@
  */
 
 #include <stdlib.h>
-#include <talloc.h>
+#include <osmocom/core/talloc.h>
 #include <osmocom/ctrl/control_vty.h>
 #include <osmocom/vty/command.h>
 

-- 
To view, visit https://gerrit.osmocom.org/1605
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc526016bda45b36e584afee8669996752d6d89c
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder


More information about the gerrit-log mailing list