Re: [Monotone-devel] you may wonder what the hell I was doing recently ...

[Thomas Keller]

Stephen Leake schrieb:
> Zack Weinberg <address@hidden> writes:
> 
>> I don't think I broke anything, but the possibility exists
>> (particularly missing #includes in various files).
> 
> not sure your stuff broke this, but on Win32 MinGW I'm getting:
> 
> ../monotone/botan/primes.cpp:608: error: integer constant is too large
> for "long" type

Get the same on OSX 10.5.6. Is the attached patch the correct way / in
the right place to fix the issue?

> This used to be just a warning, which we've been ignoring.
> 
> This will go away when nvm.stripped lands.

The question is when it will land... right now nvm is not compilable on
at least two platforms.

Thomas.

-- 
GPG-Key 0x160D1092 | address@hidden | http://thomaskeller.biz
Please note that according to the EU law on data retention, information
on every electronic information exchange might be retained for a period
of six months or longer: http://www.vorratsdatenspeicherung.de/?lang=en

#
# old_revision [7f7ddfdeaaa5c1f0257ba1ee6e858472d2c849af]
#
# patch "Makefile.am"
#  from [99f85657145e2545d84436bce52ea57c6b08b9f2]
#    to [a1dc52e4b2b5eff735fcd4c1f2518e9d7c2ee928]
#
============================================================
--- Makefile.am 99f85657145e2545d84436bce52ea57c6b08b9f2
+++ Makefile.am a1dc52e4b2b5eff735fcd4c1f2518e9d7c2ee928
@@ -405,7 +405,7 @@ AM_CFLAGS = $(AM_CPPFLAGS) -DTEMP_STORE=
 
 AM_CPPFLAGS = -I$(top_srcdir)/lua
 AM_CFLAGS = $(AM_CPPFLAGS) -DTEMP_STORE=1 -DNDEBUG -DSQLITE_OMIT_CURSOR 
-DSQLITE_OMIT_LOAD_EXTENSION -DTHREADSAFE=0 -DSQLITE_THREAD_OVERRIDE_LOCK=-1 
$(SQLITE_CPPFLAGS)
-AM_CXXFLAGS = $(AM_CPPFLAGS) $(PCH_FLAGS)
+AM_CXXFLAGS = $(AM_CPPFLAGS) $(PCH_FLAGS) -fpermissive
 
 mtn_LDADD = libplatform.a lib3rdparty.a $(BOOSTLIBS) $(LIBICONV) $(LIBINTL)
 unit_tester_LDADD = libplatform.a lib3rdparty.a \

signature.asc
Description: OpenPGP digital signature