CVS commit: src/usr.bin/m4

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Mon Oct 26 21:08:59 UTC 2009

Update of /cvsroot/src/usr.bin/m4
In directory ivanova.netbsd.org:/tmp/cvs-serv23600

Log Message:
Import new m4 from OpenBSD.

Status:

Vendor Tag:     OPENBSD
Release Tags:   OPENBSD20091026
                
C src/usr.bin/m4/Makefile
C src/usr.bin/m4/eval.c
C src/usr.bin/m4/expr.c
C src/usr.bin/m4/extern.h
C src/usr.bin/m4/gnum4.c
C src/usr.bin/m4/look.c
C src/usr.bin/m4/m4.1
C src/usr.bin/m4/main.c
C src/usr.bin/m4/mdef.h
C src/usr.bin/m4/misc.c
N src/usr.bin/m4/parser.y
C src/usr.bin/m4/pathnames.h
C src/usr.bin/m4/stdd.h
N src/usr.bin/m4/tokenizer.l
C src/usr.bin/m4/trace.c
N src/usr.bin/m4/lib/ohash_create_entry.c
N src/usr.bin/m4/lib/ohash_delete.c
N src/usr.bin/m4/lib/ohash_do.c
N src/usr.bin/m4/lib/ohash_entries.c
N src/usr.bin/m4/lib/ohash_enum.c
N src/usr.bin/m4/lib/ohash_init.3
N src/usr.bin/m4/lib/ohash_init.c
N src/usr.bin/m4/lib/ohash_int.h
N src/usr.bin/m4/lib/ohash_interval.3
N src/usr.bin/m4/lib/ohash_interval.c
N src/usr.bin/m4/lib/ohash_lookup_interval.c
N src/usr.bin/m4/lib/ohash_lookup_memory.c
N src/usr.bin/m4/lib/ohash_qlookup.c
N src/usr.bin/m4/lib/ohash_qlookupi.c
N src/usr.bin/m4/lib/strtonum.c
N src/usr.bin/m4/lib/ohash.h

13 conflicts created by this import.
Use the following command to help the merge:

        cvs checkout -jOPENBSD:yesterday -jOPENBSD src/usr.bin/m4