You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@locus.apache.org on 2000/04/26 00:33:46 UTC
cvs commit: apache-2.0/src/lib/apr/lib apr_execve.c
stoddard 00/04/25 15:33:46
Modified: src Apache.dsw
src/lib/apr/include apr_errno.h apr_strnatcmp.h
src/lib/apr/lib apr_execve.c
Log:
More win32 shotgunary to the windows project files and to
eliminate compile warnings.
Revision Changes Path
1.6 +15 -0 apache-2.0/src/Apache.dsw
Index: Apache.dsw
===================================================================
RCS file: /home/cvs/apache-2.0/src/Apache.dsw,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Apache.dsw 2000/04/25 21:18:01 1.5
+++ Apache.dsw 2000/04/25 22:33:43 1.6
@@ -128,6 +128,12 @@
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name ApacheCore
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name aprlibdll
+ End Project Dependency
}}}
###############################################################################
@@ -356,6 +362,12 @@
Begin Project Dependency
Project_Dep_Name aprlib
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name htdigest
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name logresolve
+ End Project Dependency
}}}
###############################################################################
@@ -455,6 +467,9 @@
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name aprlib
+ End Project Dependency
}}}
###############################################################################
1.29 +3 -4 apache-2.0/src/lib/apr/include/apr_errno.h
Index: apr_errno.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_errno.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- apr_errno.h 2000/04/21 14:51:25 1.28
+++ apr_errno.h 2000/04/25 22:33:43 1.29
@@ -52,12 +52,11 @@
* <http://www.apache.org/>.
*/
-#include "apr_general.h"
-#include "apr.h"
-#include <errno.h>
-
#ifndef APR_ERRNO_H
#define APR_ERRNO_H
+
+#include "apr.h"
+#include <errno.h>
#ifdef __cplusplus
extern "C" {
1.3 +13 -0 apache-2.0/src/lib/apr/include/apr_strnatcmp.h
Index: apr_strnatcmp.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_strnatcmp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apr_strnatcmp.h 2000/04/24 14:57:53 1.2
+++ apr_strnatcmp.h 2000/04/25 22:33:44 1.3
@@ -20,5 +20,18 @@
3. This notice may not be removed or altered from any source distribution.
*/
+#ifndef APR_STRNATCMP_H
+#define APR_STRNATCMP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
int ap_strnatcmp(char const *a, char const *b);
int ap_strnatcasecmp(char const *a, char const *b);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !APR_STRNATCMP_H */
1.10 +4 -3 apache-2.0/src/lib/apr/lib/apr_execve.c
Index: apr_execve.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_execve.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apr_execve.c 2000/04/22 06:16:26 1.9
+++ apr_execve.c 2000/04/25 22:33:45 1.10
@@ -109,7 +109,8 @@
* local argv[] array. The va_arg logic makes sure we do the right thing.
* XXX: malloc() is used because we expect to be overlaid soon.
*/
-ap_status_t ap_execle(const char *filename, const char *argv0, ...)
+APR_EXPORT_NONSTD(ap_status_t) ap_execle(const char *filename,
+ const char *argv0, ...)
{
va_list adummy;
char **envp;
@@ -160,8 +161,8 @@
* We have to fiddle with the argv array to make it work on platforms
* which don't support the "hashbang" interpreter line by default.
*/
-ap_status_t ap_execve(const char *filename, char * const argv[],
- char * const envp[])
+APR_EXPORT(ap_status_t) ap_execve(const char *filename, char * const argv[],
+ char * const envp[])
{
char **script_argv;
extern char **environ;