diff options
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/BKE_armature.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_winstuff.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/fileops.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/BLO_sys_types.h | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h index 1334528c035..dfe3fde17eb 100644 --- a/source/blender/blenkernel/BKE_armature.h +++ b/source/blender/blenkernel/BKE_armature.h @@ -89,7 +89,7 @@ int bone_autoside_name (char name[64], int strip_number, short axis, float head, struct Bone *get_named_bone (struct bArmature *arm, const char *name); -float distfactor_to_bone(const float vec[3], const float b1[3], const float b2[3], float rad1, float rad2, float rdist); +float distfactor_to_bone(const float vec[3], const float b1[3], const float b2[3], float r1, float r2, float rdist); void where_is_armature (struct bArmature *arm); void where_is_armature_bone(struct Bone *bone, struct Bone *prevbone); diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h index 33ca7d235fa..a0ab88e8baf 100644 --- a/source/blender/blenlib/BLI_winstuff.h +++ b/source/blender/blenlib/BLI_winstuff.h @@ -113,7 +113,9 @@ typedef unsigned int mode_t; /* python uses HAVE_SSIZE_T */ # ifndef HAVE_SSIZE_T # define HAVE_SSIZE_T 1 +# ifndef FREE_WINDOWS64 typedef long ssize_t; +# endif # endif #endif diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index 5bbfd596ba7..4b5ea44e97c 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -209,7 +209,7 @@ FILE *BLI_fopen(const char *filename, const char *mode) return ufopen(filename, mode); } -gzFile BLI_gzopen(const char *filename, const char *mode) +void *BLI_gzopen(const char *filename, const char *mode) { gzFile gzfile; diff --git a/source/blender/blenloader/BLO_sys_types.h b/source/blender/blenloader/BLO_sys_types.h index 7dbd4df1056..41e33eb2a05 100644 --- a/source/blender/blenloader/BLO_sys_types.h +++ b/source/blender/blenloader/BLO_sys_types.h @@ -100,8 +100,10 @@ typedef uint64_t u_int64_t; #include <inttypes.h> #elif defined(FREE_WINDOWS) +#ifndef FREE_WINDOWS64 /* define htoln here, there must be a syntax error in winsock2.h in MinGW */ unsigned long __attribute__((__stdcall__)) htonl(unsigned long); +#endif #include <stdint.h> #else |