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:
authorNathan Letwory <nathan@letworyinteractive.com>2010-10-18 11:24:08 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2010-10-18 11:24:08 +0400
commit9bd94eebc4d240203b89c7a0a3dfe800859ca636 (patch)
tree20d0385c77aead3ed9d9da450a98da7c4337e66b
parent6c505c97a7d0fa6628de0ee100635f66c8210d04 (diff)
_DEBUG -> DEBUG
-rw-r--r--source/blender/blenkernel/SConscript2
-rw-r--r--source/blender/blenkernel/intern/writeffmpeg.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index bbc66ac14ea..954b7759b46 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -25,7 +25,7 @@ else:
incs += ' ../python'
incs += ' ' + env['BF_PYTHON_INC']
if env['BF_DEBUG']:
- defs.append('_DEBUG')
+ defs.append('DEBUG')
if env['WITH_BF_QUICKTIME']:
incs += ' ../quicktime'
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index ec998e68e00..aae26da02dd 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -19,7 +19,7 @@
#include <string.h>
#include <stdio.h>
-#if defined(_WIN32) && defined(_DEBUG) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#if defined(_WIN32) && defined(DEBUG) && !defined(__MINGW32__) && !defined(__CYGWIN__)
/* This does not seem necessary or present on MSVC 8, but may be needed in earlier versions? */
#if _MSC_VER < 1400
#include <stdint.h>