[Sumover-dev] [svn commit] r4477 - in vic/branches/mpeg4: rtp

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Wed Jul 15 10:40:41 2009
New Revision: 4477

Modified:
   vic/branches/mpeg4/config.h
   vic/branches/mpeg4/rtp/session.cpp

Log:
On windows, include process.h for it's declaration of getpid() instead of using a local declaration which doesn't match the one in the library.

Modified: vic/branches/mpeg4/config.h
==============================================================================
--- vic/branches/mpeg4/config.h	(original)
+++ vic/branches/mpeg4/config.h	Wed Jul 15 10:40:41 2009
@@ -159,6 +159,7 @@
 #include <stdio.h>
 #include <memory.h>
 #include <errno.h>
+#include <process.h>
 #include <math.h>
 #include <stdlib.h>   /* abs() */
 #include <string.h>
@@ -308,7 +309,7 @@
 int gethostid(void);
 int getuid(void);
 int getgid(void);
-int getpid(void);
+#define getpid _getpid
 int nice(int);
 int sendmsg(int, struct msghdr*, int);
 time_t time(time_t *);

Modified: vic/branches/mpeg4/rtp/session.cpp
==============================================================================
--- vic/branches/mpeg4/rtp/session.cpp	(original)
+++ vic/branches/mpeg4/rtp/session.cpp	Wed Jul 15 10:40:41 2009
@@ -35,7 +35,7 @@
 #include <errno.h>
 #include <string.h>
 #ifdef WIN32
-extern "C" int getpid();
+#include <process.h>
 #endif
 #include "source.h"
 #include "vic_tcl.h"