[simspark-cvs] simspark/spark/zeitgeist/fileserver fileserver.h, 1.1, 1.2

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist/fileserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/spark/zeitgeist/fileserver

Modified Files:
	fileserver.h 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: fileserver.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/fileserver/fileserver.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fileserver.h	5 Dec 2005 21:05:01 -0000	1.1
--- fileserver.h	15 Mar 2007 07:26:31 -0000	1.2
***************
*** 85,89 ****
      //
  public:
!     typedef int THandle;
  
  protected:
--- 85,89 ----
      //
  public:
!     typedef long THandle;
  
  protected: