From 1705b5a65eb9166cc04a1991e71cdc749b8d2fd3 Mon Sep 17 00:00:00 2001 From: jbrodman Date: Thu, 10 Apr 2014 01:08:12 -0700 Subject: [PATCH 1/3] guard for single inclusion --- examples/util/util.isph | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/util/util.isph b/examples/util/util.isph index 1e598dc5..454df8f0 100644 --- a/examples/util/util.isph +++ b/examples/util/util.isph @@ -1,5 +1,9 @@ +#ifndef UTIL_ISPH +#define UTIL_ISPH // utility function to read the value of programCount from C/C++ export uniform int32 get_programCount() { return programCount; } + +#endif // UTIL_ISPH \ No newline at end of file From 61970e15008b042363f8d9e615279c8ed0c1e4db Mon Sep 17 00:00:00 2001 From: jbrodman Date: Thu, 10 Apr 2014 01:08:12 -0700 Subject: [PATCH 2/3] guard for single inclusion --- examples/util/util.isph | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/examples/util/util.isph b/examples/util/util.isph index 1e598dc5..7c075ac4 100644 --- a/examples/util/util.isph +++ b/examples/util/util.isph @@ -1,5 +1,42 @@ +/* + Copyright (c) 2010-2014, Intel Corporation + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of Intel Corporation nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef UTIL_ISPH +#define UTIL_ISPH // utility function to read the value of programCount from C/C++ export uniform int32 get_programCount() { return programCount; } + +#endif // UTIL_ISPH From a8b03e768c5d8185f573b86726b112b493b5a91c Mon Sep 17 00:00:00 2001 From: jbrodman Date: Thu, 10 Apr 2014 01:13:46 -0700 Subject: [PATCH 3/3] 2014. --- examples/util/util.isph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/util/util.isph b/examples/util/util.isph index 7c075ac4..f0498a6f 100644 --- a/examples/util/util.isph +++ b/examples/util/util.isph @@ -1,5 +1,5 @@ /* - Copyright (c) 2010-2014, Intel Corporation + Copyright (c) 2014, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without