[sr-dev] git:master:cabd13a6: core: additional change to commit 63cc0c1df10138 - also remove #ifndef SHM_MEM

[Henning Westerholt]

Module: kamailio
Branch: master
Commit: cabd13a69a81cc2b7bdb7e9ce5f23288694be78e
URL: https://github.com/kamailio/kamailio/commit/cabd13a69a81cc2b7bdb7e9ce5f23288694be78e

Author: Henning Westerholt <hw at kamailio.org>
Committer: Henning Westerholt <hw at kamailio.org>
Date: 2018-12-26T21:24:23+01:00

core: additional change to commit 63cc0c1df10138 - also remove #ifndef SHM_MEM

---

Modified: src/core/tcp_main.c
Modified: src/core/timer.c

---

Diff:  https://github.com/kamailio/kamailio/commit/cabd13a69a81cc2b7bdb7e9ce5f23288694be78e.diff
Patch: https://github.com/kamailio/kamailio/commit/cabd13a69a81cc2b7bdb7e9ce5f23288694be78e.patch

---

diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c
index 3ac1289779..7266c63cea 100644
--- a/src/core/tcp_main.c
+++ b/src/core/tcp_main.c
@@ -28,10 +28,6 @@
 #ifdef USE_TCP
 
 
-#ifndef SHM_MEM
-#error "shared memory support needed (add -DSHM_MEM to Makefile.defs)"
-#endif
-
 #define HANDLE_IO_INLINE
 #include "io_wait.h" /* include first to make sure the needed features are
 						turned on (e.g. _GNU_SOURCE for POLLRDHUP) */
diff --git a/src/core/timer.c b/src/core/timer.c
index fc6f49872c..92e26ba5f1 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -1017,11 +1017,6 @@ int register_timer(timer_function f, void* param, unsigned int interval)
 
 ticks_t get_ticks_raw()
 {
-#ifndef SHM_MEM
-	LM_CRIT("no shared memory support compiled in"
-			", returning 0 (probably wrong)");
-	return 0;
-#endif
 	return *ticks;
 }
 
@@ -1030,11 +1025,6 @@ ticks_t get_ticks_raw()
 /* returns tick in s (for compatibility with the old code) */
 ticks_t get_ticks()
 {
-#ifndef SHM_MEM
-	LM_CRIT("no shared memory support compiled in"
-			", returning 0 (probably wrong)");
-	return 0;
-#endif
 	return TICKS_TO_S(*ticks);
 }