385518 - SQLite build break after update to 3.3.17

Status: RESOLVED FIXED

(Core :: SQLite and Embedded Database Bindings, defect)

Description

[Peter Weilbacher]

Attachment: SQLite build fix

Compiling or linking sqlite3/storage is broken on OS/2 since bug 341137 went in, at least when high memory is enabled (also see bug 217538 comment 31). I guess that is why the nightly builds are all broken at the moment. This patch should fix that. I have just checked it into SQLite CVS upstream, too, so that will be in SQLite 3.4.1 and hopefully appear with the next SQLite sync.

Comment 1

[Shawn Wilsher :sdwilsh]

Was there a ticket filed for this upstream?  I'm just trying to do good bookkeeping here :)

Comment 2

[Peter Weilbacher]

No, I just checked it in directly, checkins 4109 and 4110:
   http://www.sqlite.org/cvstrac/chngview?cn=4109
   http://www.sqlite.org/cvstrac/chngview?cn=4110
SQLite doesn't have a review system like Mozilla does, so filing tickets is not really necessary for small changes like these...

Comment 3

[Peter Weilbacher]

Fix checked into trunk.

Comment 4

[Walter Meinl]

Peter, I also recognized the build break due to the sqlite update last week. As I hadn't the time to trace it down, I remember that I wondered why it broke, because the highmem related lines were present also in the amalgamation file. After your checkin, the lines around
http://lxr.mozilla.org/seamonkey/source/db/sqlite3/src/sqlite3.c#10481
are present twice. Probably the build failure in highmem builds after the checkin of the original patch were due to the wrong order of os2.h and os2safe.h.
Maybe you want to remove the doubled lines.

Comment 5

[Peter Weilbacher]

Will do that in SQLite upstream, trying to include it twice doesn't hurt.