Add remaining APR_DECLARE()s to all headers. Conditionally added

  APR_DECLARES() to the sources, based on compilation emits (there
  are many that should be changed eventually, but the compiler will
  emit errors if those sources are added for win32).

  This change also splits libapr from apr, so the two projects are
  compiled seperately.  Both .dsp files must be kept up-to-date with
  source file revisions.

  Finally, libapr.def is no longer needed - so it is gone.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61072 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 0 deletions

diff --git a/include/apr_getopt.h b/include/apr_getopt.h
index 63037bda5..9feb6a721 100644
--- a/include/apr_getopt.h
+++ b/include/apr_getopt.h
@@ -57,6 +57,10 @@
 
 #include "apr_pools.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /**
  * @package APR command arguments
  */ 
@@ -165,4 +169,9 @@ APR_DECLARE(apr_status_t) apr_getopt(apr_getopt_t *os, const char *opts,
 APR_DECLARE(apr_status_t) apr_getopt_long(apr_getopt_t *os,
 					  const apr_getopt_option_t *opts,
 					  int *optch, const char **optarg);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* ! APR_GETOPT_H */