diff options
| -rw-r--r-- | libglusterfs/src/compat.h | 20 | ||||
| -rw-r--r-- | libglusterfs/src/glusterfs.h | 13 |
2 files changed, 13 insertions, 20 deletions
diff --git a/libglusterfs/src/compat.h b/libglusterfs/src/compat.h index af192f3c73f..fe8efd7153e 100644 --- a/libglusterfs/src/compat.h +++ b/libglusterfs/src/compat.h @@ -494,26 +494,6 @@ int gf_mkostemp (char *tmpl, int suffixlen, int flags); #define CLOCK_REALTIME_COARSE CLOCK_REALTIME #endif -#ifndef IPV6_DEFAULT - -#ifndef IXDR_GET_LONG -#define IXDR_GET_LONG(buf) ((long)IXDR_GET_U_INT32(buf)) -#endif - -#ifndef IXDR_PUT_LONG -#define IXDR_PUT_LONG(buf, v) ((long)IXDR_PUT_INT32(buf, (long)(v))) -#endif - -#ifndef IXDR_GET_U_LONG -#define IXDR_GET_U_LONG(buf) ((u_long)IXDR_GET_LONG(buf)) -#endif - -#ifndef IXDR_PUT_U_LONG -#define IXDR_PUT_U_LONG(buf, v) IXDR_PUT_LONG(buf, (long)(v)) -#endif - -#endif /* IPV6_DEFAULT */ - #if defined(__GNUC__) && !defined(RELAX_POISONING) /* Use run API, see run.h */ #include <stdlib.h> /* system(), mkostemp() */ diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h index 56be7487ce7..89a421416fa 100644 --- a/libglusterfs/src/glusterfs.h +++ b/libglusterfs/src/glusterfs.h @@ -32,6 +32,19 @@ #include "glusterfs-fops.h" /* generated XDR values for FOPs */ +#ifndef IXDR_GET_LONG +#define IXDR_GET_LONG(buf) ((long)IXDR_GET_U_INT32(buf)) +#endif +#ifndef IXDR_PUT_LONG +#define IXDR_PUT_LONG(buf, v) ((long)IXDR_PUT_INT32(buf, (long)(v))) +#endif +#ifndef IXDR_GET_U_LONG +#define IXDR_GET_U_LONG(buf) ((u_long)IXDR_GET_LONG(buf)) +#endif +#ifndef IXDR_PUT_U_LONG +#define IXDR_PUT_U_LONG(buf, v) IXDR_PUT_LONG(buf, (long)(v)) +#endif + #include "list.h" #include "locking.h" #include "logging.h" |