From fd693a671b88be9589ce584ecfbb288fdb0e796b Mon Sep 17 00:00:00 2001 From: phredi Date: Tue, 24 May 2016 23:24:49 -0500 Subject: [PATCH] FreeBSD Compile Fixes --- common/mysql_request_result.h | 6 ++++++ common/useperl.h | 10 ++++++++++ zone/embperl.h | 11 +++++++++++ 3 files changed, 27 insertions(+) diff --git a/common/mysql_request_result.h b/common/mysql_request_result.h index 2944f528b..4b2c56310 100644 --- a/common/mysql_request_result.h +++ b/common/mysql_request_result.h @@ -10,6 +10,12 @@ #include "types.h" #include "mysql_request_row.h" +#ifdef __FreeBSD__ + #include + #include + #include +#endif + class MySQLRequestResult { private: MYSQL_RES* m_Result; diff --git a/common/useperl.h b/common/useperl.h index 3c0bf8f1c..e9a02d604 100644 --- a/common/useperl.h +++ b/common/useperl.h @@ -46,6 +46,16 @@ extern "C" { //the perl headers dont do this for us... #undef THIS #endif +//These need to be cleaned up on FreeBSD +#ifdef __FreeBSD__ +#ifdef do_open +#undef do_open +#endif + +#ifdef do_close +#undef do_close +#endif +#endif #endif /*EMU_PERL_H_*/ diff --git a/zone/embperl.h b/zone/embperl.h index e5d07a3d8..ebd76fa0e 100644 --- a/zone/embperl.h +++ b/zone/embperl.h @@ -54,6 +54,17 @@ extern "C" { //the perl headers dont do this for us... #ifdef Zero #undef Zero #endif +//These need to be cleaned up on FreeBSD + +#ifdef __FreeBSD__ +#ifdef do_open +#undef do_open +#endif + +#ifdef do_close +#undef do_close +#endif +#endif //so embedded scripts can use xs extensions (ala 'use socket;') EXTERN_C void boot_DynaLoader(pTHX_ CV* cv);