aboutsummaryrefslogtreecommitdiffstats
path: root/testing/apparmor/0001-Remove-__BEGIN_DECLS-and-__END_DECLS-identifiers.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/apparmor/0001-Remove-__BEGIN_DECLS-and-__END_DECLS-identifiers.patch')
-rw-r--r--testing/apparmor/0001-Remove-__BEGIN_DECLS-and-__END_DECLS-identifiers.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/testing/apparmor/0001-Remove-__BEGIN_DECLS-and-__END_DECLS-identifiers.patch b/testing/apparmor/0001-Remove-__BEGIN_DECLS-and-__END_DECLS-identifiers.patch
deleted file mode 100644
index 49422e7b7d..0000000000
--- a/testing/apparmor/0001-Remove-__BEGIN_DECLS-and-__END_DECLS-identifiers.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/libraries/libapparmor/include/sys/apparmor.h b/libraries/libapparmor/include/sys/apparmor.h
-index 752a5bd..0944c4c 100644
---- a/libraries/libapparmor/include/sys/apparmor.h
-+++ b/libraries/libapparmor/include/sys/apparmor.h
-@@ -22,7 +22,9 @@
- #include <stdint.h>
- #include <sys/types.h>
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- /*
- * Class of public mediation types in the AppArmor policy db
-@@ -191,6 +193,8 @@ extern int aa_policy_cache_remove(int dirfd, const char *path);
- extern int aa_policy_cache_replace_all(aa_policy_cache *policy_cache,
- aa_kernel_interface *kernel_interface);
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* sys/apparmor.h */
-diff --git a/libraries/libapparmor/include/sys/apparmor_private.h b/libraries/libapparmor/include/sys/apparmor_private.h
-index 6472de9..00bbee4 100644
---- a/libraries/libapparmor/include/sys/apparmor_private.h
-+++ b/libraries/libapparmor/include/sys/apparmor_private.h
-@@ -20,7 +20,9 @@
- #include <stdio.h>
- #include <sys/stat.h>
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- int _aa_is_blacklisted(const char *name);
-
-@@ -33,6 +35,8 @@ int _aa_asprintf(char **strp, const char *fmt, ...);
- int _aa_dirat_for_each(int dirfd, const char *name, void *data,
- int (* cb)(int, const char *, struct stat *, void *));
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* sys/apparmor_private.h */
---
-2.11.2
-