[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55698] trunk/blender/source/blender/ blenlib/intern: code cleanup: includes

Campbell Barton ideasman42 at gmail.com
Mon Apr 1 13:27:47 CEST 2013


Revision: 55698
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55698
Author:   campbellbarton
Date:     2013-04-01 11:27:47 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
code cleanup: includes

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/BLI_dynstr.c
    trunk/blender/source/blender/blenlib/intern/DLRB_tree.c
    trunk/blender/source/blender/blenlib/intern/fileops.c
    trunk/blender/source/blender/blenlib/intern/freetypefont.c
    trunk/blender/source/blender/blenlib/intern/graph.c
    trunk/blender/source/blender/blenlib/intern/threads.c

Modified: trunk/blender/source/blender/blenlib/intern/BLI_dynstr.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_dynstr.c	2013-04-01 10:53:29 UTC (rev 55697)
+++ trunk/blender/source/blender/blenlib/intern/BLI_dynstr.c	2013-04-01 11:27:47 UTC (rev 55698)
@@ -30,12 +30,11 @@
  *  \ingroup bli
  */
 
-
-#include <stdarg.h>
+#include <stdlib.h>  /* malloc */
 #include <string.h>
 
 #include "MEM_guardedalloc.h"
-#include "BLI_blenlib.h"
+#include "BLI_string.h"
 #include "BLI_dynstr.h"
 
 #ifdef _WIN32

Modified: trunk/blender/source/blender/blenlib/intern/DLRB_tree.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/DLRB_tree.c	2013-04-01 10:53:29 UTC (rev 55697)
+++ trunk/blender/source/blender/blenlib/intern/DLRB_tree.c	2013-04-01 11:27:47 UTC (rev 55698)
@@ -30,7 +30,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
 #include "BLI_dlrbTree.h"
 
 /* *********************************************** */

Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/fileops.c	2013-04-01 10:53:29 UTC (rev 55697)
+++ trunk/blender/source/blender/blenlib/intern/fileops.c	2013-04-01 11:27:47 UTC (rev 55698)
@@ -30,8 +30,8 @@
  */
 
 
+#include <stdlib.h>  /* malloc */
 #include <string.h>
-#include <stdio.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -42,9 +42,9 @@
 #include "zlib.h"
 
 #ifdef WIN32
-#ifdef __MINGW32__
-#include <ctype.h>
-#endif
+#  ifdef __MINGW32__
+#    include <ctype.h>
+#  endif
 #  include <io.h>
 #  include "BLI_winstuff.h"
 #  include "BLI_callbacks.h"
@@ -60,8 +60,11 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
+#include "BLI_path_util.h"
+#include "BLI_fileops.h"
 
 #include "MEM_sys_types.h" // for intptr_t support
 

Modified: trunk/blender/source/blender/blenlib/intern/freetypefont.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/freetypefont.c	2013-04-01 10:53:29 UTC (rev 55697)
+++ trunk/blender/source/blender/blenlib/intern/freetypefont.c	2013-04-01 11:27:47 UTC (rev 55698)
@@ -47,10 +47,11 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_vfontdata.h"
-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
 #include "BLI_math.h"
-#include "BLI_utildefines.h"
 
 #include "DNA_vfont_types.h"
 #include "DNA_packedFile_types.h"

Modified: trunk/blender/source/blender/blenlib/intern/graph.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/graph.c	2013-04-01 10:53:29 UTC (rev 55697)
+++ trunk/blender/source/blender/blenlib/intern/graph.c	2013-04-01 11:27:47 UTC (rev 55698)
@@ -25,19 +25,17 @@
  *  \ingroup bli
  */
 
-
-#include <float.h> 
+#include <float.h>
 #include <math.h>
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
+#include "BLI_listbase.h"
 #include "BLI_graph.h"
-#include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_utildefines.h"
 
 
-
 static void testRadialSymmetry(BGraph *graph, BNode *root_node, RadialArc *ring, int total, float axis[3], float limit, int group);
 
 static void handleAxialSymmetry(BGraph *graph, BNode *root_node, int depth, float axis[3], float limit);

Modified: trunk/blender/source/blender/blenlib/intern/threads.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/threads.c	2013-04-01 10:53:29 UTC (rev 55697)
+++ trunk/blender/source/blender/blenlib/intern/threads.c	2013-04-01 11:27:47 UTC (rev 55698)
@@ -29,14 +29,13 @@
  *  \ingroup bli
  */
 
-
+#include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 
 #include "MEM_guardedalloc.h"
 
-
-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
 #include "BLI_gsqueue.h"
 #include "BLI_threads.h"
 




More information about the Bf-blender-cvs mailing list