diff options
| author | Wayne Meissner <wmeissner@gmail.com> | 2012-07-21 17:57:06 +1000 |
|---|---|---|
| committer | Wayne Meissner <wmeissner@gmail.com> | 2012-07-21 17:57:06 +1000 |
| commit | 39e6659d125fd3f56fe8863e3c33eb0d1b729486 (patch) | |
| tree | b09ecc42583364754091189c40a1e2e9f542d308 | |
| parent | 1adf68ffe1af14570c14c8fb3308bba8f2300121 (diff) | |
| download | ffi-39e6659d125fd3f56fe8863e3c33eb0d1b729486.tar.gz | |
Rename endian.h to rbffi_endian.h to avoid conflict with system <endian.h>
| -rw-r--r-- | ext/ffi_c/Buffer.c | 2 | ||||
| -rw-r--r-- | ext/ffi_c/Platform.c | 2 | ||||
| -rw-r--r-- | ext/ffi_c/Pointer.c | 2 | ||||
| -rw-r--r-- | ext/ffi_c/rbffi_endian.h (renamed from ext/ffi_c/endian.h) | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ext/ffi_c/Buffer.c b/ext/ffi_c/Buffer.c index c39caad..49b90cc 100644 --- a/ext/ffi_c/Buffer.c +++ b/ext/ffi_c/Buffer.c @@ -31,7 +31,7 @@ typedef int bool; #include <limits.h> #include <ruby.h> #include "rbffi.h" -#include "endian.h" +#include "rbffi_endian.h" #include "AbstractMemory.h" #define BUFFER_EMBED_MAXLEN (8) diff --git a/ext/ffi_c/Platform.c b/ext/ffi_c/Platform.c index 69836ab..5de8e2b 100644 --- a/ext/ffi_c/Platform.c +++ b/ext/ffi_c/Platform.c @@ -32,7 +32,7 @@ typedef int bool; #endif #include <ruby.h> #include <ctype.h> -#include "endian.h" +#include "rbffi_endian.h" #include "Platform.h" #if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) #include <gnu/lib-names.h> diff --git a/ext/ffi_c/Pointer.c b/ext/ffi_c/Pointer.c index b64c65f..6766dc2 100644 --- a/ext/ffi_c/Pointer.c +++ b/ext/ffi_c/Pointer.c @@ -31,7 +31,7 @@ typedef int bool; #include <limits.h> #include <ruby.h> #include "rbffi.h" -#include "endian.h" +#include "rbffi_endian.h" #include "AbstractMemory.h" #include "Pointer.h" diff --git a/ext/ffi_c/endian.h b/ext/ffi_c/rbffi_endian.h index efb994e..c1bc744 100644 --- a/ext/ffi_c/endian.h +++ b/ext/ffi_c/rbffi_endian.h @@ -8,7 +8,7 @@ #include <sys/types.h> #if defined(__linux__) || defined(__CYGWIN__) || defined(__GNU__) || defined(__GLIBC__) -# include_next <endian.h> +# include <endian.h> #endif #ifdef __sun |