]>
Commit | Line | Data |
---|---|---|
dfd6fa1b | 1 | diff -ur anyterm-1.1.4-o/apachemod/lock.h anyterm-1.1.4/apachemod/lock.h |
2 | --- anyterm-1.1.4-o/apachemod/lock.h 2005-06-23 15:20:33.000000000 -0600 | |
3 | +++ anyterm-1.1.4/apachemod/lock.h 2005-07-15 21:06:16.000000000 -0600 | |
4 | @@ -31,8 +31,8 @@ | |
5 | ||
6 | #include <apr_atomic.h> | |
7 | #define atomic_type apr_uint32_t | |
8 | -#define atomic_add(var,val) apr_atomic_add(&(var),(atomic_type)(val)) | |
9 | -#define atomic_compare_and_set(var,cmpwith,setto) (apr_atomic_cas(&(var),(setto),(cmpwith))==(cmpwith)) | |
10 | +#define atomic_add(var,val) apr_atomic_add32(&(var),(atomic_type)(val)) | |
11 | +#define atomic_compare_and_set(var,cmpwith,setto) (apr_atomic_cas32(&(var),(setto),(cmpwith))==(cmpwith)) | |
12 | ||
13 | ||
14 | class Mutex { | |
15 | diff -ur anyterm-1.1.4-o/apachemod/Makefile anyterm-1.1.4/apachemod/Makefile | |
16 | --- anyterm-1.1.4-o/apachemod/Makefile 2005-07-10 16:05:48.000000000 -0600 | |
17 | +++ anyterm-1.1.4/apachemod/Makefile 2005-07-15 21:05:23.000000000 -0600 | |
18 | @@ -35,7 +35,8 @@ | |
19 | ||
20 | CPP_FLAGS=$(shell rote-config --cflags) \ | |
21 | $(shell $(APR_CONFIG) --cppflags --includes) \ | |
22 | - -I$(shell $(APXS2) -q INCLUDEDIR) | |
23 | + -I$(shell $(APXS2) -q INCLUDEDIR) \ | |
24 | + $(INCLUDES) | |
25 | ||
26 | COMPILE_FLAGS=$(CPP_FLAGS) $(shell $(APR_CONFIG) --cflags) -Wall -O | |
27 | ||
28 | @@ -52,7 +53,7 @@ | |
29 | ||
30 | ||
31 | %.lo: %.cc | |
32 | - libtool --mode=compile g++ $(CC_COMPILE_FLAGS) -o $@ -c $< | |
33 | + libtool --mode=compile --tag=CXX g++ $(CC_COMPILE_FLAGS) -o $@ -c $< | |
34 | ||
35 | %.lo: %.c | |
36 | libtool --mode=compile gcc $(C_COMPILE_FLAGS) -o $@ -c $< |