Compilation error while back-porting serial-terminal

[Johan Kohler]

Hi,
I'm attempting to back-port the new serial port functionality to Emacs
22.2 (on win32).  This is the first time I'm working with Emacs
source.  I'm getting the following compilation error:

In file included from w32.c:40:
process.h:40: error: syntax error before "Lisp_Object"
process.h:40: warning: no semicolon at end of struct or union
process.h:42: warning: data definition has no type or storage class
process.h:44: error: syntax error before "tty_name"
...

w32.c: In function `serial_configure':
w32.c:4328: error: dereferencing pointer to incomplete type
w32.c:4330: error: dereferencing pointer to incomplete type
w32.c:4332: error: dereferencing pointer to incomplete type
w32.c:4361: error: dereferencing pointer to incomplete type
w32.c:4370: error: dereferencing pointer to incomplete type
w32.c:4384: error: dereferencing pointer to incomplete type
w32.c:4414: error: dereferencing pointer to incomplete type
w32.c:4431: error: dereferencing pointer to incomplete type
w32.c:4465: error: dereferencing pointer to incomplete type

The first set of errors seems to relate to Lisp_Object while the
second set relates to Lisp_Process.
I would appreciate it if someone can glance at the diff and compile
log attached and point me in the right direction.   If someone wants
to test the "patch" that would be great too.  Shout if I should
provide it in a different format.

Thanks,
Johan

johank-emacs22-2.diff
Description: Binary data

johank-compilation.txt
Description: Text document