diff --git a/include/nif_basic_types.h b/include/nif_basic_types.h index e82bb2afe69e8555030cced3f366e36f612885dd..222b36a1cee0212b94b023ffff830f21059d7439 100644 --- a/include/nif_basic_types.h +++ b/include/nif_basic_types.h @@ -30,8 +30,8 @@ typedef unsigned char byte; /*! Specifies the low-level nature of the storage process */ enum EndianType { - NIF_BIG_ENDIAN = 0, /*!< Big Endian storage, such as that used by PowerPC processors */ - NIF_LITTLE_ENDIAN = 1 /*!< Little Endian storage, such as that used by x86 processors */ + ENDIAN_BIG = 0, /*!< Big Endian storage, such as that used by PowerPC processors */ + ENDIAN_LITTLE = 1 /*!< Little Endian storage, such as that used by x86 processors */ }; //--Structures--// @@ -41,12 +41,12 @@ enum EndianType { * the way an existing file was stored. */ struct NifInfo { - NifInfo() : version(VER_4_0_0_2), userVersion(0), userVersion2(0), endian(NIF_LITTLE_ENDIAN) {} + NifInfo() : version(VER_4_0_0_2), userVersion(0), userVersion2(0), endian(ENDIAN_LITTLE) {} NifInfo( unsigned version, unsigned userVersion = 0, unsigned userVersion2 = 0) { this->version = version; this->userVersion = userVersion; this->userVersion2 = userVersion2; - endian = NIF_LITTLE_ENDIAN; + endian = ENDIAN_LITTLE; } unsigned version; unsigned userVersion; diff --git a/src/NIF_IO.cpp b/src/NIF_IO.cpp index 04e41708eb1ba4c97c4a6bbc5c77c92baea1eee6..fb65adf858a2cdacfa18347aa4e167b31256987c 100644 --- a/src/NIF_IO.cpp +++ b/src/NIF_IO.cpp @@ -24,9 +24,9 @@ EndianType DetectEndianType() { short r = *(short *)test; if ( r == 1 ) { - return NIF_LITTLE_ENDIAN; + return ENDIAN_LITTLE; } else { - return NIF_BIG_ENDIAN; + return ENDIAN_BIG; } }