diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-10 15:10:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-10 15:10:30 +0000 |
| commit | a7690048b8f7727506fe41797d7bebd896f2499a (patch) | |
| tree | 6db274a8fbcc3be9e30207b0057aa7dc5ba1d397 | |
| parent | f80a7fda745a96a895184b92077a6356c305c2bb (diff) | |
| parent | 1d781ccbeab3364ac18c487f66893847fe5e102f (diff) | |
| download | podman-a7690048b8f7727506fe41797d7bebd896f2499a.tar.gz podman-a7690048b8f7727506fe41797d7bebd896f2499a.tar.bz2 podman-a7690048b8f7727506fe41797d7bebd896f2499a.zip | |
Merge pull request #12564 from Darkness4/main
rootless: declare TEMP_FAILURE_RETRY before usage (Fixes: #12563)
| -rw-r--r-- | pkg/rootless/rootless_linux.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index e71d5d999..92f331ce4 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -19,6 +19,15 @@ #include <sys/select.h> #include <stdio.h> +#ifndef TEMP_FAILURE_RETRY +#define TEMP_FAILURE_RETRY(expression) \ + (__extension__ \ + ({ long int __result; \ + do __result = (long int) (expression); \ + while (__result == -1L && errno == EINTR); \ + __result; })) +#endif + #define cleanup_free __attribute__ ((cleanup (cleanup_freep))) #define cleanup_close __attribute__ ((cleanup (cleanup_closep))) #define cleanup_dir __attribute__ ((cleanup (cleanup_dirp))) @@ -72,15 +81,6 @@ int rename_noreplace (int olddirfd, const char *oldpath, int newdirfd, const cha return rename (oldpath, newpath); } -#ifndef TEMP_FAILURE_RETRY -#define TEMP_FAILURE_RETRY(expression) \ - (__extension__ \ - ({ long int __result; \ - do __result = (long int) (expression); \ - while (__result == -1L && errno == EINTR); \ - __result; })) -#endif - static const char *_max_user_namespaces = "/proc/sys/user/max_user_namespaces"; static const char *_unprivileged_user_namespaces = "/proc/sys/kernel/unprivileged_userns_clone"; |