Small patch

[Jonanin]

Just some fixes when I was trying to get 2.2 to compile.

First part fixes an error in the declaration of a function. Second one fixes a forward-declare of an enum (you can't forward declare enums...)

[rombust]

Patch committed, many thanks