/ Check-in [cde62657]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Warning cleanup from MSVC.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:cde62657d6f410a3d6899cd7b4000d276fe3c813
User & Date: shaneh 2010-10-04 14:11:55
Context
2010-10-04
15:47
Fix memsubsys1.test so that it works with TEMP_STORE>=2. check-in: 8ad88ee0 user: dan tags: trunk
14:11
Warning cleanup from MSVC. check-in: cde62657 user: shaneh tags: trunk
11:01
Fix broken evidence marks in e_expr.test. check-in: 37ff94ce user: dan tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/malloc.c.

138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
  if( n<0 ) return priorLimit;
  if( n>0 ){
    sqlite3MemoryAlarm(softHeapLimitEnforcer, 0, n);
  }else{
    sqlite3MemoryAlarm(0, 0, 0);
  }
  excess = sqlite3_memory_used() - n;
  if( excess>0 ) sqlite3_release_memory(excess & 0x7fffffff);
  return priorLimit;
}
void sqlite3_soft_heap_limit(int n){
  if( n<0 ) n = 0;
  sqlite3_soft_heap_limit64(n);
}








|







138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
  if( n<0 ) return priorLimit;
  if( n>0 ){
    sqlite3MemoryAlarm(softHeapLimitEnforcer, 0, n);
  }else{
    sqlite3MemoryAlarm(0, 0, 0);
  }
  excess = sqlite3_memory_used() - n;
  if( excess>0 ) sqlite3_release_memory((int)(excess & 0x7fffffff));
  return priorLimit;
}
void sqlite3_soft_heap_limit(int n){
  if( n<0 ) n = 0;
  sqlite3_soft_heap_limit64(n);
}