administrativa

[m6w6/ext-psi] / php_psi_posix.h.in

diff --git a/php_psi_posix.h.in b/php_psi_posix.h.in
index 47bfc09512eddf7299c737d728602873a3f21907..4f4acd3a28e7877a3d92bf60e2a62598101bb8be 100644 (file)
--- a/php_psi_posix.h.in
+++ b/php_psi_posix.h.in
@@ -38,32 +38,6 @@ static struct psi_std_type {
 };
 #endif
 
-#ifdef PSI_PREDEF_TYPES
-static struct psi_predef_type {
-       token_t type_tag;
-       const char *type_name;
-       const char *alias;
-} psi_predef_types[] = {
-@PSI_TYPES@
-       {0}
-};
-#endif
-
-#ifdef PSI_PREDEF_COMPOSITES
-static struct psi_predef_composite {
-       token_t type_tag;
-       const char *type_name;
-       const char *var_name;
-       size_t offset;
-       size_t size;
-       size_t pointer_level;
-       size_t array_size;
-} psi_predef_composites[] = {
-@PSI_COMPOSITES@
-       {0}
-};
-#endif
-
 #ifdef PSI_PREDEF_CONSTS
 static struct psi_predef_const {
        token_t type_tag;
@@ -76,40 +50,39 @@ static struct psi_predef_const {
 };
 #endif
 
-#ifdef PSI_PREDEF_DECLS
-static struct psi_predef_decl {
-       enum {
-               DECL_KIND_STD,
-               DECL_KIND_VARARG,
-               DECL_KIND_FUNCTOR
-       } kind;
-       token_t type_tag;
-       const char *type_name;
-       const char *var_name;
-       size_t pointer_level;
-       size_t array_size;
-} psi_predef_decls[] = {
-@PSI_DECLS@
-       {0}
-};
-#endif
-
 #ifdef PSI_FUNC_REDIRS
-@PSI_MACROS@
-
 typedef void (*psi_func_ptr)();
 static struct psi_func_redir {
        const char *name;
        psi_func_ptr func;
 } psi_func_redirs[] = {
+       /* inline byte swapping */
+#ifdef __APPLE__
+       {"_OSSwapInt16", psi_swap16},
+       {"_OSSwapInt32", psi_swap32},
+       {"_OSSwapInt64", psi_swap64}
+#elif defined(__FreeBSD__)
+       {"bswap16", psi_swap16}
+       {"bswap32", psi_swap32}
+       {"bswap64", psi_swap64}
+#elif defined(__OpenBSD__)
+       {"swap16", psi_swap16}
+       {"swap32", psi_swap32}
+       {"swap64", psi_swap64}
+#elif defined(__NetBSD__)
+       {"bswap16", psi_swap16}
+       {"bswap32", psi_swap32}
+       {"bswap64", psi_swap64}
+#endif
        /* needed from libc_nonshared.a */
        {"fstat", (psi_func_ptr) fstat},
        {"fstatat", (psi_func_ptr) fstatat},
        {"lstat", (psi_func_ptr) lstat},
        {"mknod", (psi_func_ptr) mknod},
+#ifdef HAVE_MKNODAT
        {"mknodat", (psi_func_ptr) mknodat},
+#endif
        {"stat", (psi_func_ptr) stat},
-@PSI_REDIRS@
        {0}
 };
 #endif