Module Name: xsrc
Committed By: joerg
Date: Sun Jan 4 18:08:34 UTC 2015
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fccache.c
Log Message:
Avoid __UNVOLATILE here, just inline the cast. We don't have
src/tools/compat's header here.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/fontconfig/dist/src/fccache.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fccache.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccache.c:1.7 xsrc/external/mit/fontconfig/dist/src/fccache.c:1.8
--- xsrc/external/mit/fontconfig/dist/src/fccache.c:1.7 Fri Dec 19 18:10:18 2014
+++ xsrc/external/mit/fontconfig/dist/src/fccache.c Sun Jan 4 18:08:34 2015
@@ -297,7 +297,7 @@ free_lock (void)
lock = fc_atomic_ptr_get (&cache_lock);
if (lock && fc_atomic_ptr_cmpexch (&cache_lock, lock, NULL)) {
FcMutexFinish (lock);
- free (__UNVOLATILE(lock));
+ free (((void *)(uintptr_t)lock));
}
}
