# # patch "ChangeLog" # from [484a145eaac0500d4fc2a0938b9ca924ef565ef3] # to [4bf865d8a8bf07e474bb88c641b396aa991b878e] # # patch "Makefile.am" # from [be248657770d095c57adeb83f7363cc0fcbb6a49] # to [aeaf86e5a6e10673c3bf421e423ade7831db2766] # # patch "pch.hh" # from [c321bf3d348009cd9eedc4807a113483687b2941] # to [78a67446ecaea37e66a7f5eb7b74ec7aa119c5f2] # ======================================================================== --- ChangeLog 484a145eaac0500d4fc2a0938b9ca924ef565ef3 +++ ChangeLog 4bf865d8a8bf07e474bb88c641b396aa991b878e @@ -1,3 +1,9 @@ +2005-11-29 Matt Johnston + + * Makefile.am: add PCH_FLAGS only when compiling monotone and + unit_tests objects, not for libs. + * pch.hh: define __STDC_CONSTANT_MACROS as required for UINT32_C. + 2005-11-28 Nathaniel Smith * txt2c.cc (main): Work correctly even on empty files. ======================================================================== --- Makefile.am be248657770d095c57adeb83f7363cc0fcbb6a49 +++ Makefile.am aeaf86e5a6e10673c3bf421e423ade7831db2766 @@ -262,7 +262,7 @@ AM_CPPFLAGS = AM_CFLAGS = $(AM_CPPFLAGS) -DTEMP_STORE=1 -DNDEBUG -DBOOST_DISABLE_THREADS -DBOOST_SP_DISABLE_THREADS -DSQLITE_OMIT_CURSOR $(SQLITE_CPPFLAGS) -AM_CXXFLAGS = $(AM_CPPFLAGS) $(PCH_FLAGS) -DNDEBUG -DBOOST_DISABLE_THREADS -DBOOST_SP_DISABLE_THREADS +AM_CXXFLAGS = $(AM_CPPFLAGS) -DNDEBUG -DBOOST_DISABLE_THREADS -DBOOST_SP_DISABLE_THREADS AM_LDFLAGS = lib3rdparty_a_CPPFLAGS = @@ -272,10 +272,11 @@ monotone_LDFLAGS = monotone_CPPFLAGS = -I$(top_srcdir)/lua -I$(top_srcdir)/sqlite monotone_CFLAGS = $(AM_CFLAGS) $(MONOTONE_CFLAGS) -monotone_CXXFLAGS = $(AM_CXXFLAGS) $(MONOTONE_CXXFLAGS) +monotone_CXXFLAGS = $(AM_CXXFLAGS) $(PCH_FLAGS) $(MONOTONE_CXXFLAGS) unit_tests_LDFLAGS = unit_tests_CPPFLAGS = -DBUILD_UNIT_TESTS -I$(top_srcdir)/lua -I$(top_srcdir)/sqlite +unit_tests_CXXFLAGS = $(AM_CXXFLAGS) $(PCH_FLAGS) # conditionals from configury ======================================================================== --- pch.hh c321bf3d348009cd9eedc4807a113483687b2941 +++ pch.hh 78a67446ecaea37e66a7f5eb7b74ec7aa119c5f2 @@ -1,6 +1,12 @@ +// this is how you "ask for" the C99 constant constructor macros. *and* +// you have to do so before any other files accidentally include +// stdint.h. awesome. (from change_set.cc, required for UINT32_C) +#define __STDC_CONSTANT_MACROS + #ifdef WIN32 #define BOOST_NO_STDC_NAMESPACE #endif + #include #include #include