From patchwork Mon Aug 5 01:09:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 14236 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DE786449E54 for ; Mon, 5 Aug 2019 04:10:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BACB568A568; Mon, 5 Aug 2019 04:10:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22C7068066A for ; Mon, 5 Aug 2019 04:10:13 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id u25so61008948wmc.4 for ; Sun, 04 Aug 2019 18:10:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yufpofzW1RcZd3tVNepFoM/k4LxOlWlrnFYm69l/XX0=; b=JQAs+fkfUqzU9KuGTvs42l9hz9QxWoLsKbpnM0yBWKXFkkW1seNuRDNgdh3T0BRTCK DTqbPAO1rwk/zMdJn3nrdS4JJ1QRI0YSDZ4yTZJet5ONmbsb0Ca+Z4I6L+XrP0pGzdiR 3k3wW87LU2L+ks78CROWVv9OkrBUFJTH4svxfBbnzmoPE/3TygG9tV1Eo7w35vi+BIVO JRNV0846UUXFS806G6FKpO3UWgMPNLPp9kBgSjbkt799dw7DICTKu5XvoK152z4gYH6t 1HE2kJbMoJPiNMLwqWd8Cs5LyCCOfZ1uKHDl1Le+LZ0ZpIO8Nxs6P8Yvo9JrBsdw39Md mGtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yufpofzW1RcZd3tVNepFoM/k4LxOlWlrnFYm69l/XX0=; b=D/T86h8/pE0Ef/mXhdYcvsk7BeKzkPBlLKWNFWp8aQfCB7RmDZqSJnhbRTU9EJav+H Zcv8HdLfmjT1VmvYABS/lHqNYnOsUgCPCsqg4hzwBuh3Mj1biy9Wo4uuH1rkfvlyzbvg Uf/n5oi61umnxAw8HJX/4ae2bOwyTT4ucQdn+IQGS1dQS9aIWwN4aviKLPiSFZIKWG5H oeiQmVjNpdsjwdkPqI1IVvqObmur+tRumZTH0jnfJgRXk+2ICx65+r3FxTsppKvDdLwP w44sp26uhTgv93dwXfJc1knLyTytbgrsxZqPgqxFHagB4kqgHRw+Wk3KluwpLCRoHjm5 fW4A== X-Gm-Message-State: APjAAAUcDZwsTTywv38fiXT8eiDJwHQb67kMDsDFUa3n0IxCMKXMvzRc s7QjPOkXJCVUDvCh8BzMrGyAr+i5 X-Google-Smtp-Source: APXvYqxhqgTW6akuzGzBm2XDfT1+ACgnPTd5u3bgZlZwUvWZdye40y9SUI8e5Y2/bTnyL6G6/dCnkg== X-Received: by 2002:a05:600c:c4:: with SMTP id u4mr15340395wmm.96.1564967412455; Sun, 04 Aug 2019 18:10:12 -0700 (PDT) Received: from localhost.localdomain (ipbcc06ceb.dynamic.kabel-deutschland.de. [188.192.108.235]) by smtp.gmail.com with ESMTPSA id c30sm161678718wrb.15.2019.08.04.18.10.11 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 04 Aug 2019 18:10:11 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Aug 2019 03:09:41 +0200 Message-Id: <20190805010941.17268-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <809f4b6d-2324-eb15-2d18-a4a6d416bc49@rothenpieler.org> References: <809f4b6d-2324-eb15-2d18-a4a6d416bc49@rothenpieler.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] compat/cuda: Change inclusion guards X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 --- compat/cuda/cuda_runtime.h | 6 +++--- compat/cuda/dynlink_loader.h | 6 +++--- tests/ref/fate/source | 1 - 3 files changed, 6 insertions(+), 7 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 -#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