[syslinux:master] pxe_api.h: finish revert of 9acbffd

syslinux-bot for Gene Cumm gene.cumm at gmail.com
Sun Nov 27 07:54:25 PST 2016

Commit-ID:  bb41e935cc83c6242de24d2271e067d76af3585c
Gitweb:     http://www.syslinux.org/commit/bb41e935cc83c6242de24d2271e067d76af3585c
Author:     Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Sun, 27 Nov 2016 10:51:20 -0500
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Sun, 27 Nov 2016 10:51:20 -0500

pxe_api.h: finish revert of 9acbffd

9acbffd33b9200ffe37833463b4d4478e824295a caused more issues than it solves.
There appears to be a bigger underlying issue that the __weak argument masks.
Until the underlying issue is solved, we need __weak.

Signed-off-by: Gene Cumm <gene.cumm at gmail.com>

 com32/include/syslinux/pxe_api.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/com32/include/syslinux/pxe_api.h b/com32/include/syslinux/pxe_api.h
index 9b90e63..37c9cfb 100644
--- a/com32/include/syslinux/pxe_api.h
+++ b/com32/include/syslinux/pxe_api.h
@@ -587,9 +587,9 @@ typedef struct s_PXENV_UNLOAD_STACK {
 int __weak pxe_call(int, void *);
 void __weak unload_pxe(uint16_t flags);
-uint32_t pxe_dns(const char *);
+uint32_t __weak pxe_dns(const char *);
-extern uint32_t SendCookies;
-void http_bake_cookies(void);
+extern uint32_t __weak SendCookies;
+void __weak http_bake_cookies(void);
 #endif /* _SYSLINUX_PXE_API_H */

More information about the Syslinux-commits mailing list