X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Futil.h;h=0e9353dbd5c42056eae02da2d283480cdabdab8a;hb=0ec6cfb13b4d9ef14b90119cf662e47ed559a185;hp=a9d5048a09b439d2cb15386e80cb79ef761bde65;hpb=02dd3123a0e312f1d33403e744af52dd6096f12d;p=openvswitch diff --git a/lib/util.h b/lib/util.h index a9d5048a..0e9353db 100644 --- a/lib/util.h +++ b/lib/util.h @@ -80,7 +80,7 @@ extern const char *program_name; /* Given POINTER, the address of the given MEMBER in a STRUCT object, returns the STRUCT object. */ #define CONTAINER_OF(POINTER, STRUCT, MEMBER) \ - ((STRUCT *) ((char *) (POINTER) - offsetof (STRUCT, MEMBER))) + ((STRUCT *) (void *) ((char *) (POINTER) - offsetof (STRUCT, MEMBER))) #ifdef __cplusplus extern "C" { @@ -123,7 +123,9 @@ bool str_to_double(const char *, double *); int hexit_value(int c); +char *get_cwd(void); char *dir_name(const char *file_name); +char *abs_file_name(const char *dir, const char *file_name); void ignore(bool x OVS_UNUSED);