[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59730] trunk/blender/source/blender: Some function didn't match their declaration

Sergey Sharybin sergey.vfx at gmail.com
Mon Sep 2 13:19:21 CEST 2013


Revision: 59730
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59730
Author:   nazgul
Date:     2013-09-02 11:19:21 +0000 (Mon, 02 Sep 2013)
Log Message:
-----------
Some function didn't match their declaration

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/path_util.c
    trunk/blender/source/blender/render/intern/source/zbuf.c

Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c	2013-09-02 10:34:27 UTC (rev 59729)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c	2013-09-02 11:19:21 UTC (rev 59730)
@@ -1695,7 +1695,7 @@
 /**
  * Append a filename to a dir, ensuring slash separates.
  */
-void BLI_path_append(char *dst, const size_t maxlen, const char *file)
+void BLI_path_append(char *__restrict dst, const size_t maxlen, const char *__restrict file)
 {
 	size_t dirlen = BLI_strnlen(dst, maxlen);
 
@@ -1716,7 +1716,7 @@
  * Simple appending of filename to dir, does not check for valid path!
  * Puts result into *dst, which may be same area as *dir.
  */
-void BLI_join_dirfile(char *dst, const size_t maxlen, const char *dir, const char *file)
+void BLI_join_dirfile(char *__restrict dst, const size_t maxlen, const char *__restrict dir, const char *__restrict file)
 {
 	size_t dirlen = BLI_strnlen(dir, maxlen);
 

Modified: trunk/blender/source/blender/render/intern/source/zbuf.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/zbuf.c	2013-09-02 10:34:27 UTC (rev 59729)
+++ trunk/blender/source/blender/render/intern/source/zbuf.c	2013-09-02 11:19:21 UTC (rev 59730)
@@ -911,7 +911,7 @@
 
 void zbufclipwire(ZSpan *zspan, int obi, int zvlnr, int ec,
                   const float ho1[4], const float ho2[4], const float ho3[4], const float ho4[4],
-                  int c1, int c2, int c3, int c4)
+                  const int c1, const int c2, const int c3, const int c4)
 {
 	float vez[20];
 	int and, or;




More information about the Bf-blender-cvs mailing list