From c50e7fd2204441d699830300277d292576aa6889 Mon Sep 17 00:00:00 2001 From: Daniel Miller Date: Sat, 22 Nov 2014 05:08:36 -0800 Subject: [PATCH 09/14] Add some guards to make sure we build/link APR as a static lib --- apr-iconv/include/apr_iconv.h | 5 +++++ apr-util/include/apu.hw | 5 +++++ apr/include/apr.hw | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/apr-iconv/include/apr_iconv.h b/apr-iconv/include/apr_iconv.h index 11f11c5..42b3150 100644 --- a/apr-iconv/include/apr_iconv.h +++ b/apr-iconv/include/apr_iconv.h @@ -1,3 +1,8 @@ +#ifndef RC_INVOKED +#ifndef API_DECLARE_STATIC +#error "API_DECLARE_STATIC not defined" +#endif +#endif /*- * Copyright (c) 1999,2000 * Konstantin Chuguev. All rights reserved. diff --git a/apr-util/include/apu.hw b/apr-util/include/apu.hw index 64d27bd..ec52e35 100644 --- a/apr-util/include/apu.hw +++ b/apr-util/include/apu.hw @@ -1,3 +1,8 @@ +#ifndef RC_INVOKED +#ifndef APU_DECLARE_STATIC +#error "APU_DECLARE_STATIC not defined" +#endif +#endif /* 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. diff --git a/apr/include/apr.hw b/apr/include/apr.hw index 9d8506d..ad78039 100644 --- a/apr/include/apr.hw +++ b/apr/include/apr.hw @@ -1,3 +1,8 @@ +#ifndef RC_INVOKED +#ifndef APR_DECLARE_STATIC +#error "APR_DECLARE_STATIC not defined" +#endif +#endif /* 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. -- 2.1.1