Skip to content

Commit

Permalink
Enforce dropping the isset macro from sys/param.h
Browse files Browse the repository at this point in the history
builtin_functions.h can't compile on
platforms where sys/param.h gets included later
in the #include stack than builtin_functions.h

By explicitly including it here and clearing the
macro, we ensure it doesn't get reset.
  • Loading branch information
sgolemon committed Aug 2, 2012
1 parent 89ef486 commit 49a527e
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion src/runtime/base/builtin_functions.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,15 @@
#include <runtime/base/util/request_local.h>
#include <util/case_insensitive.h>

#ifdef __APPLE__
#if defined(__APPLE__) || defined(__FreeBSD__)
/**
* We don't actually use param.h in this file,
* but other files which use us do, and we want
* to enforce clearing of the isset macro from
* that header by handling the header now
* and wiping it out.
*/
# include <sys/param.h>
# ifdef isset
# undef isset
# endif
Expand Down

0 comments on commit 49a527e

Please sign in to comment.