Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2019-08-05 04:09:41 +0300
committerTimo Rothenpieler <timo@rothenpieler.org>2019-08-05 13:11:48 +0300
commitfc6f02b29772aa714c10916ab653697a3afe8ae5 (patch)
tree2d30682e8c71fac24e925d91e34df4a62cfd59fd /compat
parentd09370b060881047900408f271b151e024adca83 (diff)
compat/cuda: Change inclusion guards
cuda_runtime.h as well as dynlink_loader.h used nonstandard inclusion guards with an AV_ prefix, although these files are not in an libav*/ path. So change the inclusion guards and adapt the ref file of the source fate test accordingly. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Diffstat (limited to 'compat')
-rw-r--r--compat/cuda/cuda_runtime.h6
-rw-r--r--compat/cuda/dynlink_loader.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/compat/cuda/cuda_runtime.h b/compat/cuda/cuda_runtime.h
index dbe50f8711..92c55ad859 100644
--- a/compat/cuda/cuda_runtime.h
+++ b/compat/cuda/cuda_runtime.h
@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AV_COMPAT_CUDA_CUDA_RUNTIME_H
-#define AV_COMPAT_CUDA_CUDA_RUNTIME_H
+#ifndef COMPAT_CUDA_CUDA_RUNTIME_H
+#define COMPAT_CUDA_CUDA_RUNTIME_H
// Common macros
#define __global__ __attribute__((global))
@@ -128,4 +128,4 @@ static inline __device__ T tex2D(cudaTextureObject_t texObject, float x, float y
return ret;
}
-#endif
+#endif /* COMPAT_CUDA_CUDA_RUNTIME_H */
diff --git a/compat/cuda/dynlink_loader.h b/compat/cuda/dynlink_loader.h
index 9f93465088..ca79e604c7 100644
--- a/compat/cuda/dynlink_loader.h
+++ b/compat/cuda/dynlink_loader.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AV_COMPAT_CUDA_DYNLINK_LOADER_H
-#define AV_COMPAT_CUDA_DYNLINK_LOADER_H
+#ifndef COMPAT_CUDA_DYNLINK_LOADER_H
+#define COMPAT_CUDA_DYNLINK_LOADER_H
#include "libavutil/log.h"
#include "compat/w32dlfcn.h"
@@ -30,4 +30,4 @@
#include <ffnvcodec/dynlink_loader.h>
-#endif
+#endif /* COMPAT_CUDA_DYNLINK_LOADER_H */