Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2007-04-29 14:49:02 +0400
committerTon Roosendaal <ton@blender.org>2007-04-29 14:49:02 +0400
commit243d1a28c0635a85c2dca9a23e9465b170b0ba3a (patch)
tree90a6fb16f8ca90d04d70e8ff129c24c98b7f003a /source/blender/blenlib
parente4d6f331eb90f7375a241a7698bd6958b6ced326 (diff)
Casting fixes for 64 bits. Incomplete commit, discussion on proper casting
has to be finished.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/intern/fileops.c4
-rw-r--r--source/blender/blenlib/intern/util.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
index 232546b89ca..fcea30982bd 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -75,7 +75,7 @@ char *first_slash(char *string) {
if (!ffslash) return fbslash;
else if (!fbslash) return ffslash;
- if ((int)ffslash < (int)fbslash) return ffslash;
+ if ((long)ffslash < (long)fbslash) return ffslash;
else return fbslash;
}
@@ -88,7 +88,7 @@ char *BLI_last_slash(char *string) {
if (!lfslash) return lbslash;
else if (!lbslash) return lfslash;
- if ((int)lfslash < (int)lbslash) return lbslash;
+ if ((long)lfslash < (long)lbslash) return lbslash;
else return lfslash;
}
diff --git a/source/blender/blenlib/intern/util.c b/source/blender/blenlib/intern/util.c
index 83e110101dc..cfce8e3dafa 100644
--- a/source/blender/blenlib/intern/util.c
+++ b/source/blender/blenlib/intern/util.c
@@ -1540,7 +1540,7 @@ void *BLI_pointer_from_int(int val)
firsttime= 0;
free(poin);
}
- return basevalue | (((long)val)<<3);
+ return (void *)(basevalue | (((long)val)<<3));
}
#else