Browse Source

- fixed change_semaphore prototype
- fixed Makefile.defs not picking -DFAST_LOCK on Sun

Andrei Pelinescu-Onciul 23 years ago
parent
commit
43fcad5667
3 changed files with 19 additions and 17 deletions
  1. 17 15
      Makefile.defs
  2. 1 1
      modules/tm/lock.c
  3. 1 1
      modules/tm/lock.h

+ 17 - 15
Makefile.defs

@@ -8,7 +8,7 @@
 VERSION = 0
 PATCHLEVEL = 8
 SUBLEVEL = 7
-EXTRAVERSION = -5-unstable
+EXTRAVERSION = -6-unstable
 
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 OS = $(shell uname -s)
@@ -80,8 +80,8 @@ DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
 	 -DF_MALLOC  -DUSE_SYNONIM\
 	 -DSHM_MEM  -DSHM_MMAP \
 	 -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 \
-	 -DWAIT -DNEW_HNAME  -DNOISY_REPLIES -DBOGDAN_TRIFLE \
-	 #-DNO_DEBUG \
+	 -DNO_DEBUG \
+	 -DWAIT -DNEW_HNAME   # -DNOISY_REPLIES -DBOGDAN_TRIFLE \
 	 #-DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=0 \
 	 #-DNOSMP \
 	 #-DEXTRA_DEBUG 
@@ -91,21 +91,11 @@ DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
 #-DSTATS 
 #-DNO_LOG
 
-# arh. specific definitions
-ifeq ($(ARCH), i386)
-	DEFS+= -DFAST_LOCK
-endif
-
-ifeq ($(ARCH), sparc64)
-ifeq 	($(CC_NAME), gcc)
-		DEFS+= -DFAST_LOCK
-endif
-endif
 
 
 #PROFILE=  -pg #set this if you want profiling
-mode = debug
-#mode = release
+#mode = debug
+mode = release
 
 # platform dependent settings
 
@@ -162,6 +152,18 @@ $(warning	Unknown compiler $(CC)\; supported compilers: \
 endif
 
 
+# arh. specific definitions
+ifeq ($(ARCH), i386)
+	DEFS+= -DFAST_LOCK
+endif
+
+ifeq ($(ARCH), sparc64)
+ifeq 	($(CC_NAME), gcc)
+		DEFS+= -DFAST_LOCK
+endif
+endif
+
+
 # setting CFLAGS
 ifeq ($(mode), release)
 	#if i386

+ 1 - 1
modules/tm/lock.c

@@ -93,7 +93,7 @@ static int init_semaphore_set( int size )
 
 
 
-static int change_semaphore( ser_lock_t* s  , int val )
+int change_semaphore( ser_lock_t* s  , int val )
 {
 	struct sembuf pbuf;
 	int r;

+ 1 - 1
modules/tm/lock.h

@@ -76,7 +76,7 @@ int release_timerlist_lock( struct timer *timerlist );
 
 
 #ifndef FAST_LOCK
-static int change_semaphore( ser_lock_t s  , int val );
+int change_semaphore( ser_lock_t* s  , int val );
 #endif