Skip to content

Commit 641de72

Browse files
author
ubuntu14
committed
acl 3.1.0 version release
1 parent 96f6b34 commit 641de72

File tree

8 files changed

+17
-12
lines changed

8 files changed

+17
-12
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ all:
5454
@(cd unit_test; make $(MAKE_ARGS))
5555
@(cd lib_acl/samples; make)
5656
@(cd lib_protocol/samples; make)
57+
@(cd lib_acl_cpp/samples; make)
5758
# @(cd lib_dict; make $(MAKE_ARGS))
5859
# @(cd lib_tls; make $(MAKE_ARGS))
5960
clean:

lib_acl/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ CFLAGS = -c -g -W \
2727
-Wuninitialized \
2828
-D_POSIX_PTHREAD_SEMANTICS \
2929
-pedantic \
30-
-fPIC
30+
-fPIC \
31+
-Wno-invalid-source-encoding \
32+
-Wno-extended-offsetof
3133
#-Wcast-align
3234
#-Winvalid-pch -DACL_PREPARE_COMPILE
3335

lib_acl/samples/Makefile.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual \
99
-Wshadow \
1010
-D_REENTRANT \
1111
-D_POSIX_PTHREAD_SEMANTICS \
12-
-D_USE_FAST_MACRO
12+
-D_USE_FAST_MACRO \
13+
-Wno-invalid-source-encoding
1314

1415
# -Wcast-align
1516
#CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \

lib_acl/samples/Makefile_cpp.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ CFLAGS = -c -g -W \
1111
-O2 \
1212
-D_REENTRANT \
1313
-D_POSIX_PTHREAD_SEMANTICS \
14-
-D_USE_FAST_MACRO
14+
-D_USE_FAST_MACRO \
15+
-Wno-invalid-source-encoding
1516

1617
#-Wcast-align
1718

lib_acl_cpp/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ DATE_NOW = 20`date +%y`.`date +%m`.`date +%d`
130130
STATIC_LIBNAME = lib_acl_cpp.a
131131
SHARED_LIBNAME = lib_acl_cpp.so
132132

133+
lib: static
133134
all: static shared sample
134135

135136
$(shell mkdir -p $(DEF_PATH_DST))

lib_acl_cpp/samples/Makefile.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ CFLAGS = -c -g -W \
99
-Wpointer-arith \
1010
-D_REENTRANT \
1111
-D_POSIX_PTHREAD_SEMANTICS \
12-
-D_USE_FAST_MACRO
12+
-D_USE_FAST_MACRO \
13+
-Wno-invalid-source-encoding
1314

1415
#-Wcast-qual
1516
# -Wcast-align

unit_test/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SHELL = /bin/sh
2-
CC = gcc
2+
#CC = gcc
33
#CC = g++
4-
#CC = ${MY_ENV_CC}
4+
CC = ${MY_ENV_CC}
55
AR = ar
66
ARFL = rv
77
#ARFL = cru
@@ -19,7 +19,8 @@ CFLAGS = -c -g -W \
1919
-Wpointer-arith \
2020
-Waggregate-return \
2121
-Wmissing-prototypes \
22-
-Wno-long-long
22+
-Wno-long-long \
23+
-Wno-invalid-source-encoding
2324
# -Wcast-align
2425
###########################################################
2526
#Check system:

unit_test/unit_test/unit_test_fn.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44

55
#include "unit_test.h"
66

7-
int test_unit_param(AUT_LINE *test_line, void *arg_unused)
7+
int test_unit_param(AUT_LINE *test_line, void *arg_unused acl_unused)
88
{
99
char myname[] = "test_unit_param";
1010
const char *account, *sender;
1111
int number;
1212

13-
arg_unused = arg_unused;
1413
AUT_SET_STR(test_line, "account", account);
1514
AUT_SET_STR(test_line, "sender", sender);
1615
AUT_SET_INT(test_line, "number", number);
@@ -21,12 +20,10 @@ int test_unit_param(AUT_LINE *test_line, void *arg_unused)
2120
return (0);
2221
}
2322

24-
int test_unit_loop(AUT_LINE *test_line, void *arg_unused)
23+
int test_unit_loop(AUT_LINE *test_line, void *arg_unused acl_unused)
2524
{
2625
int count, i;
2726

28-
arg_unused = arg_unused;
29-
3027
AUT_SET_INT(test_line, "count", count);
3128
if (count <= 0)
3229
count = 1;

0 commit comments

Comments
 (0)