Merge pull request #303 from Nazg-Gul/reincluded-config
Fix redefined warnings from config.h
This commit is contained in:
commit
11afec2795
@ -1,3 +1,6 @@
|
|||||||
|
#ifndef GLOG_CONFIG_H
|
||||||
|
#define GLOG_CONFIG_H
|
||||||
|
|
||||||
/* define if glog doesn't use RTTI */
|
/* define if glog doesn't use RTTI */
|
||||||
#cmakedefine DISABLE_RTTI
|
#cmakedefine DISABLE_RTTI
|
||||||
|
|
||||||
@ -200,3 +203,5 @@
|
|||||||
#cmakedefine _START_GOOGLE_NAMESPACE_ ${_START_GOOGLE_NAMESPACE_}
|
#cmakedefine _START_GOOGLE_NAMESPACE_ ${_START_GOOGLE_NAMESPACE_}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // GLOG_CONFIG_H
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user