Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #33226: error loading .blend files with different endian on Mac. The cause

Browse Source 
was wrong inline and pure attributes on the endian switch function.
This commit is contained in:
Brecht Van Lommel
2012-11-26 20:37:04 +00:00
parent 5393922d1d
commit 42dc0dc5ef
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenlib/BLI_endian_switch.h
View File

@@ -29,8 +29,7 @@
#ifdef __GNUC__
# define ATTR_ENDIAN_SWITCH \
__attribute__((nonnull(1))) \
__attribute__((pure))
__attribute__((nonnull(1)))
#else
# define ATTR_ENDIAN_SWITCH
#endif

14
source/blender/blenlib/BLI_rect.h
View File

@@ -33,6 +33,9 @@
* \ingroup bli
*/
#include "DNA_vec_types.h"
#include "BLI_utildefines.h"
struct rctf;
struct rcti;
@@ -75,17 +78,6 @@ void BLI_rctf_rcti_copy(struct rctf *dst, const struct rcti *src);
void print_rctf(const char *str, const struct rctf *rect);
void print_rcti(const char *str, const struct rcti *rect);
/* hrmf, we need to work out this inline stuff */
#if defined(_MSC_VER)
# define BLI_INLINE static __forceinline
#elif defined(__GNUC__)
# define BLI_INLINE static inline __attribute((always_inline))
#else
/* #warning "MSC/GNUC defines not found, inline non-functional" */
# define BLI_INLINE static
#endif
#include "DNA_vec_types.h"
BLI_INLINE float BLI_rcti_cent_x_fl(const struct rcti *rct) { return (float)(rct->xmin + rct->xmax) / 2.0f; }
BLI_INLINE float BLI_rcti_cent_y_fl(const struct rcti *rct) { return (float)(rct->ymin + rct->ymax) / 2.0f; }
BLI_INLINE int BLI_rcti_cent_x(const struct rcti *rct) { return (rct->xmin + rct->xmax) / 2; }

10
source/blender/blenlib/BLI_utildefines.h
View File

@@ -324,11 +324,13 @@
/*little macro so inline keyword works*/
#if defined(_MSC_VER)
# define BLI_INLINE static __forceinline
#elif defined(__GNUC__)
# define BLI_INLINE static inline __attribute((always_inline))
#else
/* #warning "MSC/GNUC defines not found, inline non-functional" */
# define BLI_INLINE static
# if (defined(__APPLE__) && defined(__ppc__))
/* static inline __attribute__ here breaks osx ppc gcc42 build */
# define BLI_INLINE static __attribute__((always_inline))
# else
# define BLI_INLINE static inline __attribute__((always_inline))
# endif
#endif