aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-12-11 09:47:32 +0000
committerMatt Fleming <matt.fleming@intel.com>2013-12-11 09:47:32 +0000
commitc9eaf27f6198b97ee546cfe4f2a0efd550e533ef (patch)
tree730abd96df26b226e2d34b1783628457e7e685b2
parent237875e126c700ae538e94e5d4a7e79ee955fe5d (diff)
downloadsyslinux-c9eaf27f6198b97ee546cfe4f2a0efd550e533ef.tar.gz
syslinux-c9eaf27f6198b97ee546cfe4f2a0efd550e533ef.tar.xz
syslinux-c9eaf27f6198b97ee546cfe4f2a0efd550e533ef.zip
ldlinux: Fix recent pxe symbol regression
commit 60dabb5b1d6d ("pxe: Make the SENDCOOKIES feature for HTTP worked again") introduced a regression for ldlinux because it references the 'SendCookies' symbol, which is only provided by PXELINUX. The regression was caused because the '__weak' tag was dropped from the declaration of SendCookies. Tested-by: "Santillanes, Russel" <Russel.Santillanes@gs.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r--com32/include/syslinux/pxe_api.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/include/syslinux/pxe_api.h b/com32/include/syslinux/pxe_api.h
index f8c3c106..3e994c09 100644
--- a/com32/include/syslinux/pxe_api.h
+++ b/com32/include/syslinux/pxe_api.h
@@ -589,7 +589,7 @@ int __weak pxe_call(int, void *);
void __weak unload_pxe(uint16_t flags);
uint32_t __weak dns_resolv(const char *);
-extern uint32_t SendCookies;
+extern uint32_t __weak SendCookies;
void __weak http_bake_cookies(void);
#endif /* _SYSLINUX_PXE_API_H */