aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2012-06-15 15:52:05 -0700
committerMichael Niedermayer <michaelni@gmx.at>2012-06-17 00:38:39 +0200
commit17fad33f81c7e9787fcdc17934fc1eee6c6aa4bf (patch)
tree76c44f17b5260d9ad0ccf925516b6329c231f706 /configure
parent5c14b282d1cc407f6b9efb03564ecac75fb59471 (diff)
downloadffmpeg-17fad33f81c7e9787fcdc17934fc1eee6c6aa4bf.tar.gz
Change all uses of restrict to use av_restrict instead.
Defining restrict results - for some compilers - in changing other uses of the restrict keyword also, e.g. __declspec(restrict) gets changed to __declspec(__restrict) on MSVC. This causes compilation failures. Therefore, using a private namespace macro instead is more reliable and robust. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 0cdf7a499a..ce5c188ab7 100755
--- a/configure
+++ b/configure
@@ -3797,7 +3797,7 @@ cat > $TMPH <<EOF
#define AVCONV_DATADIR "$(eval c_escape $datadir)"
#define CC_TYPE "$cc_type"
#define CC_VERSION $cc_version
-#define restrict $_restrict
+#define av_restrict $_restrict
#define EXTERN_PREFIX "${extern_prefix}"
#define EXTERN_ASM ${extern_prefix}
#define SLIBSUF "$SLIBSUF"