Revision: 42855
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42855
Author: campbellbarton
Date: 2011-12-24 03:03:42 +0000 (Sat, 24 Dec 2011)
Log Message:
-----------
replace u_int64_t with cc99's uint64_t as suggested by Nicholas Bishop.
Modified Paths:
--------------
trunk/blender/intern/guardedalloc/MEM_sys_types.h
trunk/blender/source/blender/blenkernel/BKE_customdata.h
trunk/blender/source/blender/blenkernel/depsgraph_private.h
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenloader/BLO_sys_types.h
trunk/blender/source/blender/editors/include/ED_view3d.h
trunk/blender/source/blender/makesdna/DNA_object_types.h
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesdna/intern/dna_genfile.c
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
trunk/blender/source/blender/modifiers/intern/MOD_smooth.c
trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/intern/guardedalloc/MEM_sys_types.h
===================================================================
--- trunk/blender/intern/guardedalloc/MEM_sys_types.h 2011-12-24 02:47:13 UTC
(rev 42854)
+++ trunk/blender/intern/guardedalloc/MEM_sys_types.h 2011-12-24 03:03:42 UTC
(rev 42855)
@@ -93,6 +93,14 @@
/* Linux-i386, Linux-Alpha, Linux-ppc */
#include <stdint.h>
+/* XXX */
+#ifndef uint64_t
+typedef uint8_t u_int8_t;
+typedef uint16_t u_int16_t;
+typedef uint32_t u_int32_t;
+typedef uint64_t u_int64_t;
+#endif
+
#elif defined (__APPLE__)
#include <inttypes.h>
Modified: trunk/blender/source/blender/blenkernel/BKE_customdata.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_customdata.h 2011-12-24
02:47:13 UTC (rev 42854)
+++ trunk/blender/source/blender/blenkernel/BKE_customdata.h 2011-12-24
03:03:42 UTC (rev 42855)
@@ -41,7 +41,7 @@
struct ID;
struct CustomData;
struct CustomDataLayer;
-typedef u_int64_t CustomDataMask;
+typedef uint64_t CustomDataMask;
extern const CustomDataMask CD_MASK_BAREMESH;
extern const CustomDataMask CD_MASK_MESH;
Modified: trunk/blender/source/blender/blenkernel/depsgraph_private.h
===================================================================
--- trunk/blender/source/blender/blenkernel/depsgraph_private.h 2011-12-24
02:47:13 UTC (rev 42854)
+++ trunk/blender/source/blender/blenkernel/depsgraph_private.h 2011-12-24
03:03:42 UTC (rev 42855)
@@ -69,7 +69,7 @@
int ancestor_count;
unsigned int lay; // accumulated layers
of its relations + itself
unsigned int scelay; // layers due to being in scene
- u_int64_t customdata_mask; // customdata mask
+ uint64_t customdata_mask; // customdata mask
int lasttime; // if lasttime != DagForest->time, this node
was not evaluated yet for flushing
int BFS_dist; // BFS distance
int DFS_dist; // DFS distance
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2011-12-24
02:47:13 UTC (rev 42854)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2011-12-24
03:03:42 UTC (rev 42855)
@@ -2563,7 +2563,7 @@
#else /* ensure CD_MASK_BAREMESH for now */
EditMesh *em = (ob == scene->obedit)?
BKE_mesh_get_editmesh(ob->data): NULL;
- u_int64_t data_mask=
scene->customdata_mask | ob->customdata_mask | CD_MASK_BAREMESH;
+ uint64_t data_mask=
scene->customdata_mask | ob->customdata_mask | CD_MASK_BAREMESH;
if(em) {
makeDerivedMesh(scene, ob, em,
data_mask); /* was CD_MASK_BAREMESH */
BKE_mesh_end_editmesh(ob->data,
em);
Modified: trunk/blender/source/blender/blenloader/BLO_sys_types.h
===================================================================
--- trunk/blender/source/blender/blenloader/BLO_sys_types.h 2011-12-24
02:47:13 UTC (rev 42854)
+++ trunk/blender/source/blender/blenloader/BLO_sys_types.h 2011-12-24
03:03:42 UTC (rev 42855)
@@ -86,6 +86,14 @@
/* Linux-i386, Linux-Alpha, Linux-ppc */
#include <stdint.h>
+/* XXX */
+#ifndef uint64_t
+typedef uint8_t u_int8_t;
+typedef uint16_t u_int16_t;
+typedef uint32_t u_int32_t;
+typedef uint64_t u_int64_t;
+#endif
+
#elif defined (__APPLE__)
#include <inttypes.h>
Modified: trunk/blender/source/blender/editors/include/ED_view3d.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_view3d.h 2011-12-24
02:47:13 UTC (rev 42854)
+++ trunk/blender/source/blender/editors/include/ED_view3d.h 2011-12-24
03:03:42 UTC (rev 42855)
@@ -286,8 +286,8 @@
void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *ar, short
do_clip);
int ED_view3d_lock(struct RegionView3D *rv3d);
-u_int64_t ED_view3d_datamask(struct Scene *scene, struct View3D *v3d);
-u_int64_t ED_viewedit_datamask(struct bScreen *screen);
+uint64_t ED_view3d_datamask(struct Scene *scene, struct View3D *v3d);
+uint64_t ED_viewedit_datamask(struct bScreen *screen);
/* camera lock functions */
int ED_view3d_camera_lock_check(struct View3D *v3d, struct RegionView3D *rv3d);
Modified: trunk/blender/source/blender/makesdna/DNA_object_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_object_types.h 2011-12-24
02:47:13 UTC (rev 42854)
+++ trunk/blender/source/blender/makesdna/DNA_object_types.h 2011-12-24
03:03:42 UTC (rev 42855)
@@ -250,8 +250,8 @@
struct FluidsimSettings *fluidsimSettings; /* if fluidsim enabled,
store additional settings */
struct DerivedMesh *derivedDeform, *derivedFinal;
- u_int64_t lastDataMask; /* the custom data layer mask that was last
used to calculate derivedDeform and derivedFinal */
- u_int64_t customdata_mask; /* (extra) custom data layer mask to use for
creating derivedmesh, set by depsgraph */
+ uint64_t lastDataMask; /* the custom data layer mask that was last
used to calculate derivedDeform and derivedFinal */
+ uint64_t customdata_mask; /* (extra) custom data layer mask to use for
creating derivedmesh, set by depsgraph */
unsigned int state; /* bit masks of game
controllers that are active */
unsigned int init_state; /* bit masks of initial state as
recorded by the users */
Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h 2011-12-24
02:47:13 UTC (rev 42854)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h 2011-12-24
03:03:42 UTC (rev 42855)
@@ -970,8 +970,8 @@
/* Movie Tracking */
struct MovieClip *clip; /* active movie clip */
- u_int64_t customdata_mask; /* XXX. runtime flag for drawing,
actually belongs in the window, only used by object_handle_update() */
- u_int64_t customdata_mask_modal; /* XXX. same as above but for temp
operator use (gl renders) */
+ uint64_t customdata_mask; /* XXX. runtime flag for drawing,
actually belongs in the window, only used by object_handle_update() */
+ uint64_t customdata_mask_modal; /* XXX. same as above but for temp
operator use (gl renders) */
} Scene;
Modified: trunk/blender/source/blender/makesdna/intern/dna_genfile.c
===================================================================
--- trunk/blender/source/blender/makesdna/intern/dna_genfile.c 2011-12-24
02:47:13 UTC (rev 42854)
+++ trunk/blender/source/blender/makesdna/intern/dna_genfile.c 2011-12-24
03:03:42 UTC (rev 42855)
@@ -667,7 +667,7 @@
else if( strcmp(dna_type, "float")==0)
return SDNA_TYPE_FLOAT;
else if( strcmp(dna_type, "double")==0)
return SDNA_TYPE_DOUBLE;
else if( strcmp(dna_type, "int64_t")==0)
return SDNA_TYPE_INT64;
- else if( strcmp(dna_type, "u_int64_t")==0)
return SDNA_TYPE_UINT64;
+ else if( strcmp(dna_type, "uint64_t")==0)
return SDNA_TYPE_UINT64;
else
return -1; /* invalid! */
}
@@ -713,7 +713,7 @@
case SDNA_TYPE_INT64:
val= *( (int64_t *)olddata); break;
case SDNA_TYPE_UINT64:
- val= *( (u_int64_t *)olddata); break;
+ val= *( (uint64_t *)olddata); break;
}
switch(ctypenr) {
@@ -740,7 +740,7 @@
case SDNA_TYPE_INT64:
*( (int64_t *)curdata)= val; break;
case SDNA_TYPE_UINT64:
- *( (u_int64_t *)curdata)= val; break;
+ *( (uint64_t *)curdata)= val; break;
}
olddata+= oldlen;
Modified: trunk/blender/source/blender/makesdna/intern/makesdna.c
===================================================================
--- trunk/blender/source/blender/makesdna/intern/makesdna.c 2011-12-24
02:47:13 UTC (rev 42854)
+++ trunk/blender/source/blender/makesdna/intern/makesdna.c 2011-12-24
03:03:42 UTC (rev 42855)
@@ -939,7 +939,7 @@
add_type("float", 4); /* SDNA_TYPE_FLOAT */
add_type("double", 8); /* SDNA_TYPE_DOUBLE */
add_type("int64_t", 8); /* SDNA_TYPE_INT64 */
- add_type("u_int64_t", 8); /* SDNA_TYPE_UINT64 */
+ add_type("uint64_t", 8); /* SDNA_TYPE_UINT64 */
add_type("void", 0); /* SDNA_TYPE_VOID */
// the defines above shouldn't be output in the padding file...
Modified: trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
2011-12-24 02:47:13 UTC (rev 42854)
+++ trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
2011-12-24 03:03:42 UTC (rev 42855)
@@ -38,13 +38,13 @@
#include "BLI_math.h"
#include "BLI_utildefines.h"
+#include "MEM_guardedalloc.h"
-#include "BKE_cdderivedmesh.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_particle.h"
+#include "BKE_cdderivedmesh.h"
-#include "MEM_guardedalloc.h"
#ifdef WITH_MOD_DECIMATE
#include "LOD_decimation.h"
Modified: trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
2011-12-24 02:47:13 UTC (rev 42854)
+++ trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
2011-12-24 03:03:42 UTC (rev 42855)
@@ -47,12 +47,12 @@
#include "BLI_utildefines.h"
#include "BLI_linklist.h"
+#include "MEM_guardedalloc.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_modifier.h"
#include "BKE_particle.h"
-#include "MEM_guardedalloc.h"
#include "MOD_util.h"
Modified: trunk/blender/source/blender/modifiers/intern/MOD_smooth.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_smooth.c 2011-12-24
02:47:13 UTC (rev 42854)
+++ trunk/blender/source/blender/modifiers/intern/MOD_smooth.c 2011-12-24
03:03:42 UTC (rev 42855)
@@ -39,13 +39,12 @@
#include "BLI_utildefines.h"
#include "BLI_string.h"
+#include "MEM_guardedalloc.h"
+
#include "BKE_cdderivedmesh.h"
#include "BKE_particle.h"
#include "BKE_deform.h"
-
-#include "MEM_guardedalloc.h"
-
#include "MOD_modifiertypes.h"
#include "MOD_util.h"
Modified: trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
