Commit ce0d4001 authored by Francis Dupont's avatar Francis Dupont
Browse files

[master] Merged trac3828 (IN macros guard)

parents d2c5f1f3 5d561c3c
// Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2010, 2015 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......@@ -24,6 +24,13 @@
#include <boost/optional.hpp>
// Undefine the macro IN which is defined in some operating systems
// but conflicts the IN RR class.
#ifdef IN
#undef IN
#endif
namespace isc {
namespace util {
class InputBuffer;
......
......@@ -5,7 +5,7 @@
///////////////
///////////////
// Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2010, 2015 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......@@ -31,6 +31,13 @@
#include <boost/optional.hpp>
// Undefine the macro IN which is defined in some operating systems
// but conflicts the IN RR class.
#ifdef IN
#undef IN
#endif
namespace isc {
namespace util {
class InputBuffer;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment