back out.... joe no like. Me neither but we should

fix this since Apple and MacPorts and others are.
Just punt for now


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@824813 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 0 insertions, 147 deletions

diff --git a/include/apr_os_override.h b/include/apr_os_override.h
deleted file mode 100644
index bfef893c7..000000000
--- a/include/apr_os_override.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* 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 APR_OS_OVERRIDE_H
-#define APR_OS_OVERRIDE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#ifdef DARWIN_10
-
-#undef APR_HAS_LARGE_FILES
-#undef APR_SIZEOF_VOIDP
-#undef APR_INT64_T_FMT
-#undef APR_UINT64_T_FMT
-#undef APR_UINT64_T_HEX_FMT
-
-#ifdef __LP64__
- #define APR_HAS_LARGE_FILES  0
- #define APR_SIZEOF_VOIDP     8
- #define APR_INT64_T_FMT      "ld"
- #define APR_UINT64_T_FMT     "lu"
- #define APR_UINT64_T_HEX_FMT "lx"
-#else
- #define APR_HAS_LARGE_FILES  1
- #define APR_SIZEOF_VOIDP     4
- #define APR_INT64_T_FMT      "lld"
- #define APR_UINT64_T_FMT     "llu"
- #define APR_UINT64_T_HEX_FMT "llx"
-#endif
-
-#undef APR_IS_BIGENDIAN
-#ifdef __BIG_ENDIAN__
- #define APR_IS_BIGENDIAN	1
-#else
- #define APR_IS_BIGENDIAN	0
-#endif
-
-/*
- * ./i386/_types.h:typedef long long __int64_t;
- * ./sys/_types.h:typedef __int64_t	__darwin_off_t;
- * ./sys/types.h:typedef __darwin_off_t		off_t;
- * So off_t is always long long
- */
-#undef APR_OFF_T_FMT
-#define APR_OFF_T_FMT "lld"
-
-#endif /* DARWIN_10 */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* APR_OS_OVERRIDE_H */
diff --git a/include/arch/darwin/apr_darwin_types.h b/include/arch/darwin/apr_darwin_types.h
deleted file mode 100644
index 3667b0bc0..000000000
--- a/include/arch/darwin/apr_darwin_types.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* 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 APR_DARWIN_TYPES_H
-#define APR_DARWIN_TYPES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Darwin 10's default compiler (gcc42) builds for both 64 and
- * 32 bit architectures unless specifically told not to.
- * In those cases, we need to override types depending on how
- * we're being built at compile time
- */
-#ifdef DARWIN_10
-
-#undef APR_OFF_T_STRFN
-#undef APR_INT64_STRFN
-#undef SIZEOF_LONG
-#undef SIZEOF_SIZE_T
-#undef SIZEOF_SSIZE_T
-#undef SIZEOF_VOIDP
-
-#ifdef __LP64__
- #define APR_INT64_STRFN strtol
- #define SIZEOF_LONG    8
- #define SIZEOF_SIZE_T  8
- #define SIZEOF_SSIZE_T 8
- #define SIZEOF_VOIDP   8
-#else
- #define APR_INT64_STRFN strtoll
- #define SIZEOF_LONG    4
- #define SIZEOF_SIZE_T  4
- #define SIZEOF_SSIZE_T 4
- #define SIZEOF_VOIDP   4
-#endif
-
-/*
- * ./i386/_types.h:typedef long long __int64_t;
- * ./sys/_types.h:typedef __int64_t	__darwin_off_t;
- * ./sys/types.h:typedef __darwin_off_t		off_t;
- * So off_t is always long long
- */
-#undef APR_OFF_T_STRFN
-#define APR_OFF_T_STRFN strtoll
- 
-
-#undef SETPGRP_VOID
-#ifdef __DARWIN_UNIX03
- #define SETPGRP_VOID 1
-#else
-/* #undef SETPGRP_VOID */
-#endif
- 
-#endif /* DARWIN_10 */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* APR_DARWIN_TYPES_H */