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/25 16:50:53 UTC

svn commit: r807658 - in /commons/sandbox/runtime/trunk/src/main/native: include/acr_port.h include/acr_private.h port/strsignal.c

Author: mturk
Date: Tue Aug 25 14:50:53 2009
New Revision: 807658

URL: http://svn.apache.org/viewvc?rev=807658&view=rev
Log:
Add port header instead repeting in acr_arch

Added:
    commons/sandbox/runtime/trunk/src/main/native/include/acr_port.h   (with props)
Modified:
    commons/sandbox/runtime/trunk/src/main/native/include/acr_private.h
    commons/sandbox/runtime/trunk/src/main/native/port/strsignal.c

Added: commons/sandbox/runtime/trunk/src/main/native/include/acr_port.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr_port.h?rev=807658&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr_port.h (added)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr_port.h Tue Aug 25 14:50:53 2009
@@ -0,0 +1,56 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _ACR_PORT_H
+#define _ACR_PORT_H
+
+#include "acr_arch.h"
+
+#define UNUSED_SOURCE_FILE(F)   \
+const char __provided_##F [] = "Using system provided " #F "()"
+
+/**
+ * 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
+
+#if defined(ACR_WANT_FNMATCH)
+#define FNM_NOMATCH        1    /* Match failed. */
+#define FNM_NOSYS          2    /* Function not supported (unused). */
+
+#define FNM_NOESCAPE    0x01    /* Disable backslash escaping. */
+#define FNM_PATHNAME    0x02    /* Slash must be matched by slash. */
+#define FNM_PERIOD      0x04    /* Period must be matched by period. */
+
+#define FNM_LEADING_DIR 0x08    /* Ignore /<tail> after Imatch. */
+#define FNM_CASEFOLD    0x10    /* Case insensitive search. */
+#define FNM_IGNORECASE  FNM_CASEFOLD
+#define FNM_FILE_NAME   FNM_PATHNAME
+
+int  fnmatch(const char *, const char *, int);
+#endif
+
+#endif /* _ACR_PORT_H */
+

Propchange: commons/sandbox/runtime/trunk/src/main/native/include/acr_port.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr_private.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr_private.h?rev=807658&r1=807657&r2=807658&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr_private.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr_private.h Tue Aug 25 14:50:53 2009
@@ -273,10 +273,6 @@
 #define J2W(V)                  _w##V
 #define J2S(V)                  _c##V
 
-
-#define UNUSED_SOURCE_FILE(F)   \
-const char __unused_##F [] = "unused " #F ".c"
-
 #if CC_SIZEOF_VOIDP == 8
 typedef jlong                   jniptr;
 #define P2N(P)                  ((jlong)LLT(P))

Modified: commons/sandbox/runtime/trunk/src/main/native/port/strsignal.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/port/strsignal.c?rev=807658&r1=807657&r2=807658&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/port/strsignal.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/port/strsignal.c Tue Aug 25 14:50:53 2009
@@ -23,7 +23,7 @@
 
 #include "acr.h"
 #include "acr_private.h"
-#include "acr_arch.h"
+#include "acr_port.h"
 
 #if defined(ACR_WANT_STRSIGNAL)