This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/gemrb/core/FileCache.cpp b/gemrb/core/FileCache.cpp | |
index 0be598d..7842eb6 100644 | |
--- a/gemrb/core/FileCache.cpp | |
+++ b/gemrb/core/FileCache.cpp | |
@@ -32,6 +32,7 @@ DataStream* CacheCompressedStream(DataStream *stream, const char* filename, int | |
char fname[_MAX_PATH]; | |
ExtractFileFromPath(fname, filename); | |
+ strlwr(fname); | |
char path[_MAX_PATH]; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2011-04-16 17:56:58-0400 [-] releaseLocks(<buildbot.steps.vstudio.VC6 instance at 0x3944170>): [] | |
2011-04-16 17:56:58-0400 [-] step 'compile' complete: failure | |
2011-04-16 17:56:58-0400 [-] <Build msvc++6>: build finished | |
2011-04-16 17:56:58-0400 [-] Peer will receive following PB traceback: | |
2011-04-16 17:56:58-0400 [-] Unhandled Error | |
Traceback (most recent call last): | |
File "/Depot/BuildBot/bbot/lib/python2.7/site-packages/buildbot/process/build.py", line 504, in buil | |
dFinished | |
self.build_status.buildFinished() | |
File "/Depot/BuildBot/bbot/lib/python2.7/site-packages/buildbot/status/builder.py", line 1406, in bu |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2011-04-17 13:05:56-0400 [-] while rebuilding a build | |
Traceback (most recent call last): | |
File "/usr/lib/python2.7/threading.py", line 503, in __bootstrap | |
self.__bootstrap_inner() | |
File "/usr/lib/python2.7/threading.py", line 530, in __bootstrap_inner | |
self.run() | |
File "/usr/lib/python2.7/threading.py", line 483, in run | |
self.__target(*self.__args, **self.__kwargs) | |
--- <exception caught here> --- | |
File "/usr/lib/python2.7/site-packages/twisted/python/threadpool.py", line 207, in _worker |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Global Generalizable All Variables. | |
Global Set Automatic Introduction. | |
Require Import Program. | |
Class Arrows (O: Type): Type := Arrow: O → O → Type. | |
Class Category (O: Type) `{Arrows O}: Prop. | |
Class Fmap `{Arrows C} `{Arrows D} (F: C->D) := fmap : forall x y: C, Arrow x y -> Arrow (F x) (F y). | |
Class Functor `{Arrows C} `{Arrows D} (F:C->D) {Fmap:Fmap F} := {}. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Section test. | |
Context (T U: Type) . | |
Record rec := { x :> Type}. | |
Canonical Structure t := Build_rec T. | |
Canonical Structure u := Build_rec U. | |
Context {f : forall {r:rec}, (x r) -> unit}. | |
Check (f T). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/gemrb/core/System/Logging.h b/gemrb/core/System/Logging.h | |
index 313c5f8..e1d0d72 100644 | |
--- a/gemrb/core/System/Logging.h | |
+++ b/gemrb/core/System/Logging.h | |
@@ -76,6 +76,22 @@ GEM_EXPORT void printMessage(const char* owner, const char* message, log_color c | |
#endif | |
; | |
+/// Internal error reporting function. Exits GemRB | |
+struct gemrb_error_struct { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/gemrb/core/System/FileStream.cpp b/gemrb/core/System/FileStream.cpp | |
index 518af09..09ce8a3 100644 | |
--- a/gemrb/core/System/FileStream.cpp | |
+++ b/gemrb/core/System/FileStream.cpp | |
@@ -117,6 +117,10 @@ public: | |
return (file = fopen(name, "wb")); | |
} | |
size_t Read(void* ptr, size_t length) { | |
+ if (length == 1) { | |
+ *(char*)ptr = fgetc(file); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/tactics/auto.ml b/tactics/auto.ml | |
index fa1985d..bdc7f4a 100644 | |
--- a/tactics/auto.ml | |
+++ b/tactics/auto.ml | |
@@ -145,6 +145,7 @@ module Hint_db = struct | |
(* A list of unindexed entries starting with an unfoldable constant | |
or with no associated pattern. *) | |
hintdb_nopat : (global_reference option * stored_data) list | |
+ hintdb_includes : string list | |
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/parsing/g_proofs.ml4 b/parsing/g_proofs.ml4 | |
index 3139f57..7f7115c 100644 | |
--- a/parsing/g_proofs.ml4 | |
+++ b/parsing/g_proofs.ml4 | |
@@ -124,7 +124,8 @@ GEXTEND Gram | |
dloc = destruct_location; | |
hyptyp = constr_pattern; | |
"=>"; tac = tactic -> | |
- HintsDestruct(id,pri,dloc,hyptyp,tac) ] ] | |
+ HintsDestruct(id,pri,dloc,hyptyp,tac) |