technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Using old-style packed attribute specification for compatibility.

Browse Source
This commit is contained in:
Max Romanov
2017-08-02 13:01:54 +03:00
parent 145eeb8476
commit 83d7ab38ac
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
auto/clang
View File

@@ -153,9 +153,10 @@ nxt_feature_name=NXT_HAVE_GCC_ATTRIBUTE_PACKED
nxt_feature_run= nxt_feature_run=
nxt_feature_path= nxt_feature_path=
nxt_feature_libs= nxt_feature_libs=
nxt_feature_test="struct __attribute__ ((__packed__)) s { nxt_feature_test="struct s {
char c; char c;
}; int i;
} __attribute__ ((__packed__));
int main() { int main() {
return 1; return 1;

8
src/nxt_conf.c
View File

@@ -42,7 +42,7 @@ typedef struct nxt_conf_object_s nxt_conf_object_t;
struct nxt_conf_value_s { struct nxt_conf_value_s {
union nxt_packed { union {
uint8_t boolean; /* 1 bit. */ uint8_t boolean; /* 1 bit. */
int64_t integer; int64_t integer;
double number; double number;
@@ -52,14 +52,14 @@ struct nxt_conf_value_s {
u_char start[NXT_CONF_MAX_SHORT_STRING]; u_char start[NXT_CONF_MAX_SHORT_STRING];
} str; } str;
struct nxt_packed { struct {
u_char *start; u_char *start;
uint32_t length; uint32_t length;
} string; } nxt_packed string;
nxt_conf_array_t *array; nxt_conf_array_t *array;
nxt_conf_object_t *object; nxt_conf_object_t *object;
} u; } nxt_packed u;
uint8_t type; /* 3 bits. */ uint8_t type; /* 3 bits. */
} nxt_aligned(8); } nxt_aligned(8);