diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-09 12:20:39 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-09 12:20:39 +0400 |
commit | 9d8a08de559f2339fa084985510bf151ade76a4e (patch) | |
tree | 4ae65628ec2cf09d20b8c9873972ea3dffcaf1b3 /source | |
parent | 1f90b86ae1d6a7669ad0494a89ef012d6885f4ff (diff) |
warning fixes
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_private.h | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_structure.c | 2 | ||||
-rw-r--r-- | source/creator/creator.c | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b3af761d965..ae2baab7edc 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3493,7 +3493,7 @@ static void direct_link_mdisps(FileData *fd, int count, MDisps *mdisps, int exte memcpy(disp2, mdisps[i].disps, MEM_allocN_len(mdisps[i].disps)); MEM_freeN(mdisps[i].disps); - mdisps[i].disps = disp2; + mdisps[i].disps = (float (*)[3])disp2; } if( (fd->flags & FD_FLAGS_SWITCH_ENDIAN) && (mdisps[i].disps) ) { diff --git a/source/blender/bmesh/intern/bmesh_private.h b/source/blender/bmesh/intern/bmesh_private.h index da4ff396d8b..d34722631bf 100644 --- a/source/blender/bmesh/intern/bmesh_private.h +++ b/source/blender/bmesh/intern/bmesh_private.h @@ -51,7 +51,7 @@ int bmesh_check_element(BMesh *bm, void *element, int type); if (bmesh_check_element(bm, el, ((BMHeader*)el)->type))\ printf("check_element failure, with code %i on line %i in file\n \"%s\"\n\n", bmesh_check_element(bm, el, ((BMHeader*)el)->type), __LINE__, __FILE__); -#define bm_get_edge_link(e, v) (Link*)((v) == ((BMEdge*)(e))->v1 ? &(((BMEdge*)(e))->dlink1) : &(((BMEdge*)(e))->dlink2)) +#define bm_get_edge_link(e, v) (((v) == ((BMEdge*)(e))->v1) ? (Link*)&(((BMEdge*)(e))->dlink1) : (Link*)&(((BMEdge*)(e))->dlink2)) int bmesh_radial_length(struct BMLoop *l); int bmesh_disk_count(BMVert *v); diff --git a/source/blender/bmesh/intern/bmesh_structure.c b/source/blender/bmesh/intern/bmesh_structure.c index c5bf0d55da8..9b695c2da80 100644 --- a/source/blender/bmesh/intern/bmesh_structure.c +++ b/source/blender/bmesh/intern/bmesh_structure.c @@ -194,7 +194,7 @@ void bmesh_disk_remove_edge(struct BMEdge *e, struct BMVert *v) } if (v->e == e) - v->e = e!=e1->next ? (BMEdge*)e1->next : NULL; + v->e = (e != (BMEdge *)e1->next) ? (BMEdge *)e1->next : NULL; e1->next = e1->prev = NULL; } diff --git a/source/creator/creator.c b/source/creator/creator.c index d084d55412c..0b28a25fff7 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -356,7 +356,7 @@ double PIL_check_seconds_timer(void); } }*/ -int segmentation_handler(int sig) +void segmentation_handler(int sig) { char fname[256]; @@ -372,8 +372,6 @@ int segmentation_handler(int sig) /*induce a real crash*/ signal(SIGSEGV, SIG_DFL); *(int*)NULL = 0; - - return 0; } static int nocrashhandler(int argc, const char **argv, void *data) |