From 59384ec82a91c73c2355d620e396415e87563a94 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Sat, 29 May 2010 10:51:06 +0000
Subject: [PATCH] 	* doc/Doxyfile: 	define _MSC_VER so that code
 guarded by it can 	be processed by doxygen 	*
 src/lib/evil_stdio.c: 	* src/lib/evil_stdio.h: 	vasprintf() is also
 not in mingw crt 	* src/lib/evil_unistd.c: 	*
 src/lib/evil_unistd.h: 	getpid is declared and defined in mingw crt

SVN revision: 49287
---
 legacy/evil/ChangeLog             | 14 ++++++++++++++
 legacy/evil/doc/Doxyfile          |  2 +-
 legacy/evil/src/lib/evil_stdio.c  |  4 ++--
 legacy/evil/src/lib/evil_stdio.h  |  4 ++--
 legacy/evil/src/lib/evil_unistd.c |  2 ++
 legacy/evil/src/lib/evil_unistd.h |  3 ++-
 6 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog
index cc31972005..fbaadda9dd 100644
--- a/legacy/evil/ChangeLog
+++ b/legacy/evil/ChangeLog
@@ -1,3 +1,17 @@
+2010-05-29  Vincent Torri  <doursse at users dot sf dot net>
+
+	* doc/Doxyfile:
+	define _MSC_VER so that code guarded by it can
+	be processed by doxygen
+
+	* src/lib/evil_stdio.c:
+	* src/lib/evil_stdio.h:
+	vasprintf() is also not in mingw crt
+
+	* src/lib/evil_unistd.c:
+	* src/lib/evil_unistd.h:
+	getpid is declared and defined in mingw crt
+
 2010-04-14  Vincent Torri  <doursse at users dot sf dot net>
 
 	* src/lib/evil_stdio.c:
diff --git a/legacy/evil/doc/Doxyfile b/legacy/evil/doc/Doxyfile
index e029f12e9a..c6c7b05e1f 100644
--- a/legacy/evil/doc/Doxyfile
+++ b/legacy/evil/doc/Doxyfile
@@ -1070,7 +1070,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = _WIN32_WCE __MINGW32CE__
+PREDEFINED             = _WIN32_WCE __MINGW32CE__ _MSC_VER
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
diff --git a/legacy/evil/src/lib/evil_stdio.c b/legacy/evil/src/lib/evil_stdio.c
index d859f52c40..bc35890cc7 100644
--- a/legacy/evil/src/lib/evil_stdio.c
+++ b/legacy/evil/src/lib/evil_stdio.c
@@ -215,7 +215,7 @@ int evil_fclose_native(FILE *stream)
 
 #endif /* _WIN32_WCE */
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 
 int
 vasprintf(char **strp, const char *fmt, va_list ap)
@@ -231,4 +231,4 @@ vasprintf(char **strp, const char *fmt, va_list ap)
    return vsprintf(res, fmt, ap);
 }
 
-#endif /* _MSC_VER */
+#endif /* _WIN32 */
diff --git a/legacy/evil/src/lib/evil_stdio.h b/legacy/evil/src/lib/evil_stdio.h
index 626caac464..80827bf915 100644
--- a/legacy/evil/src/lib/evil_stdio.h
+++ b/legacy/evil/src/lib/evil_stdio.h
@@ -52,11 +52,11 @@ EAPI int evil_fclose_native(FILE *stream);
 
 #endif /* _WIN32_WCE */
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 
 EAPI int vasprintf(char **strp, const char *fmt, va_list ap);
 
-#endif /* _MSC_VER */
+#endif /* _WIN32 */
 
 
 /**
diff --git a/legacy/evil/src/lib/evil_unistd.c b/legacy/evil/src/lib/evil_unistd.c
index 177b963578..924e7ab05e 100644
--- a/legacy/evil/src/lib/evil_unistd.c
+++ b/legacy/evil/src/lib/evil_unistd.c
@@ -85,11 +85,13 @@ evil_gettimeofday(struct timeval *tp, void *tzp __UNUSED__)
  *
  */
 
+#ifdef _MSC_VER
 pid_t
 getpid(void)
 {
   return (pid_t)GetCurrentProcessId();
 }
+#endif
 
 /*
  * File related functions
diff --git a/legacy/evil/src/lib/evil_unistd.h b/legacy/evil/src/lib/evil_unistd.h
index f6566d8d42..cdb4c3122b 100644
--- a/legacy/evil/src/lib/evil_unistd.h
+++ b/legacy/evil/src/lib/evil_unistd.h
@@ -68,7 +68,7 @@ EAPI int evil_gettimeofday(struct timeval * tp, void * tzp);
  *
  */
 
-
+#ifdef _MSC_VER
 /**
  * @brief Return the process identifier of the calling process.
  *
@@ -83,6 +83,7 @@ EAPI int evil_gettimeofday(struct timeval * tp, void * tzp);
  * Supported OS: Windows XP, Windows CE.
  */
 EAPI pid_t getpid(void);
+#endif
 
 
 /*