Browse code

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

Andrei Pelinescu-Onciul authored on 07/03/2002 19:23:48
Showing 3 changed files
... ...
@@ -8,7 +8,7 @@
8 8
 VERSION = 0
9 9
 PATCHLEVEL = 8
10 10
 SUBLEVEL = 7
11
-EXTRAVERSION = -5-unstable
11
+EXTRAVERSION = -6-unstable
12 12
 
13 13
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
14 14
 OS = $(shell uname -s)
... ...
@@ -80,8 +80,8 @@ DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
80 80
 	 -DF_MALLOC  -DUSE_SYNONIM\
81 81
 	 -DSHM_MEM  -DSHM_MMAP \
82 82
 	 -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 \
83
-	 -DWAIT -DNEW_HNAME  -DNOISY_REPLIES -DBOGDAN_TRIFLE \
84
-	 #-DNO_DEBUG \
83
+	 -DNO_DEBUG \
84
+	 -DWAIT -DNEW_HNAME   # -DNOISY_REPLIES -DBOGDAN_TRIFLE \
85 85
 	 #-DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=0 \
86 86
 	 #-DNOSMP \
87 87
 	 #-DEXTRA_DEBUG 
... ...
@@ -91,21 +91,11 @@ DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
91 91
 #-DSTATS 
92 92
 #-DNO_LOG
93 93
 
94
-# arh. specific definitions
95
-ifeq ($(ARCH), i386)
96
-	DEFS+= -DFAST_LOCK
97
-endif
98
-
99
-ifeq ($(ARCH), sparc64)
100
-ifeq 	($(CC_NAME), gcc)
101
-		DEFS+= -DFAST_LOCK
102
-endif
103
-endif
104 94
 
105 95
 
106 96
 #PROFILE=  -pg #set this if you want profiling
107
-mode = debug
108
-#mode = release
97
+#mode = debug
98
+mode = release
109 99
 
110 100
 # platform dependent settings
111 101
 
... ...
@@ -162,6 +152,18 @@ $(warning	Unknown compiler $(CC)\; supported compilers: \
162 152
 endif
163 153
 
164 154
 
155
+# arh. specific definitions
156
+ifeq ($(ARCH), i386)
157
+	DEFS+= -DFAST_LOCK
158
+endif
159
+
160
+ifeq ($(ARCH), sparc64)
161
+ifeq 	($(CC_NAME), gcc)
162
+		DEFS+= -DFAST_LOCK
163
+endif
164
+endif
165
+
166
+
165 167
 # setting CFLAGS
166 168
 ifeq ($(mode), release)
167 169
 	#if i386
... ...
@@ -93,7 +93,7 @@ static int init_semaphore_set( int size )
93 93
 
94 94
 
95 95
 
96
-static int change_semaphore( ser_lock_t* s  , int val )
96
+int change_semaphore( ser_lock_t* s  , int val )
97 97
 {
98 98
 	struct sembuf pbuf;
99 99
 	int r;
... ...
@@ -76,7 +76,7 @@ int release_timerlist_lock( struct timer *timerlist );
76 76
 
77 77
 
78 78
 #ifndef FAST_LOCK
79
-static int change_semaphore( ser_lock_t s  , int val );
79
+int change_semaphore( ser_lock_t* s  , int val );
80 80
 #endif
81 81
 
82 82