Skip to content

Commit 0068558

Browse files
committed
test
1 parent 7feea5d commit 0068558

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

deps/libsmb2/lib/alloc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@
6666
#include <libsmb2.h>
6767
#include "libsmb2-private.h"
6868

69-
#ifndef offsetof
70-
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
69+
#ifndef typeof
70+
#define typeof __typeof__
7171
#endif
7272

7373
#define container_of(ptr, type, member) ({ \
74-
const __typeof__(((type *)0)->member) *__mptr = (ptr); \
75-
(type *)(void *)((char *)__mptr - offsetof(type, member)); })
74+
const typeof( ((type *)0)->member ) *__mptr = (ptr); \
75+
(type *)(void *)( (char *)__mptr - offsetof(type,member) );})
7676

7777
struct smb2_alloc_entry {
7878
struct smb2_alloc_entry *next;

deps/libsmb2/lib/dcerpc.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,13 @@
6767
#include "libsmb2-raw.h"
6868
#include "libsmb2-private.h"
6969

70+
#ifndef typeof
71+
#define typeof __typeof__
72+
#endif
73+
7074
#define container_of(ptr, type, member) ({ \
71-
const __typeof__(((type *)0)->member) *__mptr = (ptr); \
72-
(type *)(void *)((char *)__mptr - offsetof(type, member)); })
75+
const typeof( ((type *)0)->member ) *__mptr = (ptr); \
76+
(type *)(void *)( (char *)__mptr - offsetof(type,member) );})
7377

7478
struct dcerpc_deferred_pointer {
7579
dcerpc_coder coder;

0 commit comments

Comments
 (0)