You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/08/16 08:49:55 UTC
svn commit: r804635 - in
/commons/sandbox/runtime/trunk/src/main/native/include/arch:
hpux/acr_arch_private.h linux/acr_arch_private.h solaris/acr_arch_private.h
unix/acr_arch.h windows/acr_arch.h windows/acr_arch_private.h
Author: mturk
Date: Sun Aug 16 06:49:54 2009
New Revision: 804635
URL: http://svn.apache.org/viewvc?rev=804635&view=rev
Log:
Separate WANT flags and function prototypes
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/arch/hpux/acr_arch_private.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/linux/acr_arch_private.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/solaris/acr_arch_private.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/unix/acr_arch.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/hpux/acr_arch_private.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/hpux/acr_arch_private.h?rev=804635&r1=804634&r2=804635&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/arch/hpux/acr_arch_private.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/arch/hpux/acr_arch_private.h Sun Aug 16 06:49:54 2009
@@ -42,12 +42,8 @@
* Include needed functions from portable layer
*/
#define ACR_WANT_STRSIGNAL 1
-char *strsignal(int);
#define ACR_WANT_STRLCAT 1
-size_t strlcat(char *, const char *, size_t);
#define ACR_WANT_STRLCPY 1
-size_t strlcpy(char *, const char *, size_t);
-
/**
* Temporary APR flags
Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/linux/acr_arch_private.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/linux/acr_arch_private.h?rev=804635&r1=804634&r2=804635&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/arch/linux/acr_arch_private.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/arch/linux/acr_arch_private.h Sun Aug 16 06:49:54 2009
@@ -41,9 +41,7 @@
* Include needed functions from portable layer
*/
#define ACR_WANT_STRLCAT 1
-size_t strlcat(char *, const char *, size_t);
#define ACR_WANT_STRLCPY 1
-size_t strlcpy(char *, const char *, size_t);
/**
* Temporary APR flags
Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/solaris/acr_arch_private.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/solaris/acr_arch_private.h?rev=804635&r1=804634&r2=804635&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/arch/solaris/acr_arch_private.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/arch/solaris/acr_arch_private.h Sun Aug 16 06:49:54 2009
@@ -41,9 +41,7 @@
* Include needed functions from portable layer
*/
#define ACR_WANT_STRLCAT 1
-size_t strlcat(char *, const char *, size_t);
#define ACR_WANT_STRLCPY 1
-size_t strlcpy(char *, const char *, size_t);
/**
* Temporary APR flags
Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/unix/acr_arch.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/unix/acr_arch.h?rev=804635&r1=804634&r2=804635&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/arch/unix/acr_arch.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/arch/unix/acr_arch.h Sun Aug 16 06:49:54 2009
@@ -66,6 +66,19 @@
#define ACR_IOH_FLAGS(H) acr_ioh_tab[(H) & acr_ioh_mask].flags
#define ACR_IOH(H) acr_ioh_tab[(H) & acr_ioh_mask].h
+/**
+ * Function prototypes for the portable layer
+ */
+#if defined(ACR_WANT_STRSIGNAL)
+char *strsignal(int);
+#endif
+#if defined(ACR_WANT_STRLCAT)
+size_t strlcat(char *, const char *, size_t);
+#endif
+#if defined(ACR_WANT_STRLCPY)
+size_t strlcpy(char *, const char *, size_t);
+#endif
+
static ACR_INLINE void x_free(void *p)
{
if (p != NULL) {
Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h?rev=804635&r1=804634&r2=804635&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h Sun Aug 16 06:49:54 2009
@@ -411,6 +411,19 @@
#define SIG_SGE (void (*)(int))3 /* signal gets error */
#define SIG_ACK (void (*)(int))3 /* acknowledge */
+/**
+ * Function prototypes for the portable layer
+ */
+#if defined(ACR_WANT_STRSIGNAL)
+char *strsignal(int);
+#endif
+#if defined(ACR_WANT_STRLCAT)
+size_t strlcat(char *, const char *, size_t);
+#endif
+#if defined(ACR_WANT_STRLCPY)
+size_t strlcpy(char *, const char *, size_t);
+#endif
+
/*
* ---------------------------------------------------------------------
* end of POSIX utilities
Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h?rev=804635&r1=804634&r2=804635&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h Sun Aug 16 06:49:54 2009
@@ -74,11 +74,8 @@
* Include needed functions from portable layer
*/
#define ACR_WANT_STRSIGNAL 1
-char *strsignal(int);
#define ACR_WANT_STRLCAT 1
-size_t strlcat(char *, const char *, size_t);
#define ACR_WANT_STRLCPY 1
-size_t strlcpy(char *, const char *, size_t);
/**