diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in index 0d0aa9e..f61b9a4 100644 --- a/poppler/poppler-config.h.in +++ b/poppler/poppler-config.h.in @@ -171,6 +171,25 @@ char * strtok_r (char *s, const char *delim, char **save_ptr); #endif #endif +#if defined(_MSC_VER) && _MSC_VER < 1600 +const // It is a const object... +class nullptr_t +{ + public: + template + inline operator T*() const // convertible to any type of null non-member pointer... + { return 0; } + + template + inline operator T C::*() const // or any type of null member pointer... + { return 0; } + + private: + void operator&() const; // Can't take address of nullptr + +} nullptr = {}; +#endif + //------------------------------------------------------------------------ // Compiler //------------------------------------------------------------------------