selftests/bpf: replace "__auto_type" with "auto"

Replace instances of "__auto_type" with "auto" in:

	tools/testing/selftests/bpf/prog_tests/socket_helpers.h

This file does not seem to be including <linux/compiler_types.h>
directly or indirectly, so copy the definition but guard it with
!defined(auto).

Acked-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>

diff --git a/tools/testing/selftests/bpf/prog_tests/socket_helpers.h b/tools/testing/selftests/bpf/prog_tests/socket_helpers.h
index e02cabcc814e9a6a11d61ad02cf38696fb0f27ff..0d59503a0c73e44fc4043c9237e84fb8430cf158 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/socket_helpers.h
+++ b/tools/testing/selftests/bpf/prog_tests/socket_helpers.h
@@ -17,11 +17,16 @@
 #define VMADDR_CID_LOCAL 1
 #endif
 
+/* include/linux/compiler_types.h */
+#if __STDC_VERSION__ < 202311L && !defined(auto)
+# define auto __auto_type
+#endif
+
 /* include/linux/cleanup.h */
 #define __get_and_null(p, nullvalue)                                           \
        ({                                                                     \
-               __auto_type __ptr = &(p);                                      \
-               __auto_type __val = *__ptr;                                    \
+               auto __ptr = &(p);                                             \
+               auto __val = *__ptr;                                           \
                *__ptr = nullvalue;                                            \
                __val;                                                         \
        })