Commit 207fc4cf authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Move SUBTYPE_P into compat_compiler.h

parent 77bc65bb

src/common/util.h

+0 −12
Original line number Diff line number Diff line
@@ -43,18 +43,6 @@ 
#include "lib/encoding/cstring.h"

#include "lib/fs/winlib.h"



/** Macro: yield a pointer to an enclosing structure given a pointer to

 * a substructure at offset <b>off</b>. Example:

 * <pre>

 *   struct base { ... };

 *   struct subtype { int x; struct base b; } x;

 *   struct base *bp = &x.base;

 *   struct *sp = SUBTYPE_P(bp, struct subtype, b);

 * </pre>

 */

#define SUBTYPE_P(p, subtype, basemember) \

  ((void*) ( ((char*)(p)) - offsetof(subtype, basemember) ))



/* Math functions */



/* String manipulation */

src/lib/cc/compat_compiler.h

+12 −0
Original line number Diff line number Diff line
@@ -253,6 +253,18 @@ 
 */

#define STRUCT_VAR_P(st, off) ((void*) ( ((char*)(st)) + (off) ) )



/** Macro: yield a pointer to an enclosing structure given a pointer to

 * a substructure at offset <b>off</b>. Example:

 * <pre>

 *   struct base { ... };

 *   struct subtype { int x; struct base b; } x;

 *   struct base *bp = &x.base;

 *   struct *sp = SUBTYPE_P(bp, struct subtype, b);

 * </pre>

 */

#define SUBTYPE_P(p, subtype, basemember) \

  ((void*) ( ((char*)(p)) - offsetof(subtype, basemember) ))



/** Macro: Yields the number of elements in array x. */

#define ARRAY_LENGTH(x) ((sizeof(x)) / sizeof(x[0]))