[xsrc/trunk]: xsrc/external/mit/libvdpau/dist/src merge this change from maya@:

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/52290c23c0b4
branches:  trunk
changeset: 10205:52290c23c0b4
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Mar 10 04:25:39 2019 +0000

description:
merge this change from maya@:

commit 4fa18f04dce5333189004834c1183d7a14ee0ef5
Author: Maya Rashish <maya%NetBSD.org@localhost>
Date:   Sun Feb 24 09:32:11 2019 +0200

    Don't warn (-Werror) about secure_getenv, use getenv_wrapper.

    Does the same thing for netbsd.

diffstat:

 external/mit/libvdpau/dist/src/mesa_dri2.c     |  2 +-
 external/mit/libvdpau/dist/src/util.h          |  2 +-
 external/mit/libvdpau/dist/src/vdpau_wrapper.c |  6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r 95748894b84c -r 52290c23c0b4 external/mit/libvdpau/dist/src/mesa_dri2.c
--- a/external/mit/libvdpau/dist/src/mesa_dri2.c        Sun Mar 10 04:21:56 2019 +0000
+++ b/external/mit/libvdpau/dist/src/mesa_dri2.c        Sun Mar 10 04:25:39 2019 +0000
@@ -132,7 +132,7 @@
    req->driverType = DRI2DriverVDPAU;
 #ifdef DRI2DriverPrimeShift
    {
-      char *prime = secure_getenv("DRI_PRIME");
+      char *prime = getenv_wrapper("DRI_PRIME");
       if (prime) {
          unsigned int primeid;
          errno = 0;
diff -r 95748894b84c -r 52290c23c0b4 external/mit/libvdpau/dist/src/util.h
--- a/external/mit/libvdpau/dist/src/util.h     Sun Mar 10 04:21:56 2019 +0000
+++ b/external/mit/libvdpau/dist/src/util.h     Sun Mar 10 04:25:39 2019 +0000
@@ -38,7 +38,7 @@
     }
 }
 
-#ifndef HAVE_SECURE_GETENV
+#if 0 // Just substituting it for the above equivalent
 #  ifdef HAVE___SECURE_GETENV
 #    define secure_getenv __secure_getenv
 #  else
diff -r 95748894b84c -r 52290c23c0b4 external/mit/libvdpau/dist/src/vdpau_wrapper.c
--- a/external/mit/libvdpau/dist/src/vdpau_wrapper.c    Sun Mar 10 04:21:56 2019 +0000
+++ b/external/mit/libvdpau/dist/src/vdpau_wrapper.c    Sun Mar 10 04:25:39 2019 +0000
@@ -118,7 +118,7 @@
     char const * vdpau_trace;
     char const * func_name;
 
-    vdpau_driver = secure_getenv("VDPAU_DRIVER");
+    vdpau_driver = getenv_wrapper("VDPAU_DRIVER");
     if (vdpau_driver) {
         if (strchr(vdpau_driver, '/')) {
             vdpau_driver = NULL;
@@ -133,7 +133,7 @@
     }
 
     /* Don't allow setuid apps to use VDPAU_DRIVER_PATH */
-    vdpau_driver_path = secure_getenv("VDPAU_DRIVER_PATH");
+    vdpau_driver_path = getenv_wrapper("VDPAU_DRIVER_PATH");
     if (vdpau_driver_path &&
         snprintf(vdpau_driver_lib, sizeof(vdpau_driver_lib),
                  DRIVER_LIB_FORMAT, vdpau_driver_path, vdpau_driver) <
@@ -181,7 +181,7 @@
 
     _vdp_backend_dll = _vdp_driver_dll;
 
-    vdpau_trace = secure_getenv("VDPAU_TRACE");
+    vdpau_trace = getenv_wrapper("VDPAU_TRACE");
     if (vdpau_trace && atoi(vdpau_trace)) {
         SetDllHandle * set_dll_handle;