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:
authorCampbell Barton <ideasman42@gmail.com>2013-05-28 23:35:26 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-05-28 23:35:26 +0400
commit225c5fee6b046b9829643f82cf6cbce159e4e007 (patch)
tree4092b2c57ba33a616dd0a837b050d0c79f9bcc84 /source/blender/avi
parent60befcdc6297281ce226273123d3ccfc0a681aff (diff)
move BLO_sys_types.h -> BLI_sys_types.h (it had nothing todo with loading)
remove MEM_sys_types.h which was a duplicate.
Diffstat (limited to 'source/blender/avi')
-rw-r--r--source/blender/avi/AVI_avi.h2
-rw-r--r--source/blender/avi/intern/avi.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/avi/AVI_avi.h b/source/blender/avi/AVI_avi.h
index 7c217c9223d..cfa314bba04 100644
--- a/source/blender/avi/AVI_avi.h
+++ b/source/blender/avi/AVI_avi.h
@@ -53,7 +53,7 @@
#ifndef __AVI_AVI_H__
#define __AVI_AVI_H__
-#include "MEM_sys_types.h"
+#include "BLI_sys_types.h"
#include <stdio.h> /* for FILE */
typedef struct _AviChunk {
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c
index 1b1ec1c08af..48e64695822 100644
--- a/source/blender/avi/intern/avi.c
+++ b/source/blender/avi/intern/avi.c
@@ -43,8 +43,8 @@
#endif
#include "MEM_guardedalloc.h"
-#include "MEM_sys_types.h"
+#include "BLI_sys_types.h"
#include "BLI_utildefines.h"
#include "BLI_fileops.h"