diff mbox

[FFmpeg-devel] compat/cuda: Change inclusion guards

Message ID 20190805010941.17268-1-andreas.rheinhardt@gmail.com
State Accepted
Commit b307d74fe6aec009e234a1288385be8a9268bd38
Headers show

Commit Message

Andreas Rheinhardt Aug. 5, 2019, 1:09 a.m. UTC 
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>
---
 compat/cuda/cuda_runtime.h   | 6 +++---
 compat/cuda/dynlink_loader.h | 6 +++---
 tests/ref/fate/source        | 1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

Comments

Timo Rothenpieler Aug. 5, 2019, 10:12 a.m. UTC | #1 
On 05/08/2019 03:09, Andreas Rheinhardt wrote:
> 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>

applied.

Thanks!
diff mbox

Patch

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 */
diff --git a/tests/ref/fate/source b/tests/ref/fate/source
index 8e12582ce8..ad1e5b95d6 100644
--- a/tests/ref/fate/source
+++ b/tests/ref/fate/source
@@ -25,7 +25,6 @@  compat/avisynth/avs/types.h
 compat/avisynth/avxsynth_c.h
 compat/avisynth/windowsPorts/basicDataTypeConversions.h
 compat/avisynth/windowsPorts/windows2linux.h
-compat/cuda/dynlink_loader.h
 compat/djgpp/math.h
 compat/float/float.h
 compat/float/limits.h