summaryrefslogtreecommitdiff
path: root/legacy/evil
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2010-05-29 10:51:06 +0000
committerVincent Torri <vincent.torri@gmail.com>2010-05-29 10:51:06 +0000
commit59384ec82a91c73c2355d620e396415e87563a94 (patch)
tree43e101cc54e1d1b9788ad8acf45c4cad2082eac2 /legacy/evil
parentdca0b4ec2b21e733d5e2f14c1bf5a8f24c0055e7 (diff)
* 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
Diffstat (limited to 'legacy/evil')
-rw-r--r--legacy/evil/ChangeLog14
-rw-r--r--legacy/evil/doc/Doxyfile2
-rw-r--r--legacy/evil/src/lib/evil_stdio.c4
-rw-r--r--legacy/evil/src/lib/evil_stdio.h4
-rw-r--r--legacy/evil/src/lib/evil_unistd.c2
-rw-r--r--legacy/evil/src/lib/evil_unistd.h3
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 @@
12010-05-29 Vincent Torri <doursse at users dot sf dot net>
2
3 * doc/Doxyfile:
4 define _MSC_VER so that code guarded by it can
5 be processed by doxygen
6
7 * src/lib/evil_stdio.c:
8 * src/lib/evil_stdio.h:
9 vasprintf() is also not in mingw crt
10
11 * src/lib/evil_unistd.c:
12 * src/lib/evil_unistd.h:
13 getpid is declared and defined in mingw crt
14
12010-04-14 Vincent Torri <doursse at users dot sf dot net> 152010-04-14 Vincent Torri <doursse at users dot sf dot net>
2 16
3 * src/lib/evil_stdio.c: 17 * 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 =
1070# undefined via #undef or recursively expanded use the := operator 1070# undefined via #undef or recursively expanded use the := operator
1071# instead of the = operator. 1071# instead of the = operator.
1072 1072
1073PREDEFINED = _WIN32_WCE __MINGW32CE__ 1073PREDEFINED = _WIN32_WCE __MINGW32CE__ _MSC_VER
1074 1074
1075# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 1075# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
1076# this tag can be used to specify a list of macro names that should be expanded. 1076# 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)
215 215
216#endif /* _WIN32_WCE */ 216#endif /* _WIN32_WCE */
217 217
218#ifdef _MSC_VER 218#ifdef _WIN32
219 219
220int 220int
221vasprintf(char **strp, const char *fmt, va_list ap) 221vasprintf(char **strp, const char *fmt, va_list ap)
@@ -231,4 +231,4 @@ vasprintf(char **strp, const char *fmt, va_list ap)
231 return vsprintf(res, fmt, ap); 231 return vsprintf(res, fmt, ap);
232} 232}
233 233
234#endif /* _MSC_VER */ 234#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);
52 52
53#endif /* _WIN32_WCE */ 53#endif /* _WIN32_WCE */
54 54
55#ifdef _MSC_VER 55#ifdef _WIN32
56 56
57EAPI int vasprintf(char **strp, const char *fmt, va_list ap); 57EAPI int vasprintf(char **strp, const char *fmt, va_list ap);
58 58
59#endif /* _MSC_VER */ 59#endif /* _WIN32 */
60 60
61 61
62/** 62/**
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__)
85 * 85 *
86 */ 86 */
87 87
88#ifdef _MSC_VER
88pid_t 89pid_t
89getpid(void) 90getpid(void)
90{ 91{
91 return (pid_t)GetCurrentProcessId(); 92 return (pid_t)GetCurrentProcessId();
92} 93}
94#endif
93 95
94/* 96/*
95 * File related functions 97 * 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);
68 * 68 *
69 */ 69 */
70 70
71 71#ifdef _MSC_VER
72/** 72/**
73 * @brief Return the process identifier of the calling process. 73 * @brief Return the process identifier of the calling process.
74 * 74 *
@@ -83,6 +83,7 @@ EAPI int evil_gettimeofday(struct timeval * tp, void * tzp);
83 * Supported OS: Windows XP, Windows CE. 83 * Supported OS: Windows XP, Windows CE.
84 */ 84 */
85EAPI pid_t getpid(void); 85EAPI pid_t getpid(void);
86#endif
86 87
87 88
88/* 89/*