diff options
author | Damien Doligez <damien.doligez-inria.fr> | 2006-04-16 23:28:22 +0000 |
---|---|---|
committer | Damien Doligez <damien.doligez-inria.fr> | 2006-04-16 23:28:22 +0000 |
commit | 1279ab4b76cad7001b3b47902d4813947f427031 (patch) | |
tree | edfd352c4bc8217cfb8a943844840b23734722a0 /yacc | |
parent | 8604fbe7f330eaaeda35680fbf1d641a4c4a6798 (diff) | |
download | ocaml-1279ab4b76cad7001b3b47902d4813947f427031.tar.gz |
fusion des changements 3.09.1 -> 3.09.2
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7382 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'yacc')
-rw-r--r-- | yacc/.cvsignore | 1 | ||||
-rw-r--r-- | yacc/main.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/yacc/.cvsignore b/yacc/.cvsignore index 535d61a9dc..d7fa25cf97 100644 --- a/yacc/.cvsignore +++ b/yacc/.cvsignore @@ -2,3 +2,4 @@ ocamlyacc *.c.x ocamlyacc.xcoff version.h +.gdb_history diff --git a/yacc/main.c b/yacc/main.c index 41e1cb7bc3..49dd7b47da 100644 --- a/yacc/main.c +++ b/yacc/main.c @@ -157,6 +157,7 @@ void getargs(int argc, char **argv) { case '\0': input_file = stdin; + file_prefix = "stdin"; if (i + 1 < argc) usage(); return; |