From 4a7e02c6402b610965cca99c37e6e460f1f933e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Wed, 29 Mar 2017 18:44:00 +0200 Subject: [PATCH] systemlib/visibility.h: remove this file This is duplicated in src/include/visibility and is directly included via compiler flag '-include' --- src/drivers/boards/esc35-v1/bootloader/led.h | 1 - .../boards/px4cannode-v1/bootloader/led.h | 1 - src/drivers/boards/px4esc-v1/bootloader/led.h | 1 - .../boards/px4flow-v2/bootloader/led.h | 1 - .../boards/zubaxgnss-v1/bootloader/led.h | 1 - src/drivers/bootloaders/src/sched/timer.c | 1 - src/modules/muorb/adsp/px4muorb.hpp | 1 - src/modules/systemlib/err.h | 1 - src/modules/systemlib/visibility.h | 62 ------------------- src/modules/uORB/uORB.h | 2 - src/modules/uavcanesc/led.hpp | 1 - src/modules/uavcannode/led.hpp | 1 - src/modules/uavcannode/resources.hpp | 1 - src/platforms/px4_log.h | 1 - src/systemcmds/hardfault_log/hardfault_log.c | 1 - 15 files changed, 77 deletions(-) delete mode 100644 src/modules/systemlib/visibility.h diff --git a/src/drivers/boards/esc35-v1/bootloader/led.h b/src/drivers/boards/esc35-v1/bootloader/led.h index df742ff0ec..9194a2347d 100644 --- a/src/drivers/boards/esc35-v1/bootloader/led.h +++ b/src/drivers/boards/esc35-v1/bootloader/led.h @@ -31,7 +31,6 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ -#include __BEGIN_DECLS void rgb_led(int r, int g, int b, int freqs); diff --git a/src/drivers/boards/px4cannode-v1/bootloader/led.h b/src/drivers/boards/px4cannode-v1/bootloader/led.h index d00935a954..b68e4aa70d 100644 --- a/src/drivers/boards/px4cannode-v1/bootloader/led.h +++ b/src/drivers/boards/px4cannode-v1/bootloader/led.h @@ -31,7 +31,6 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ -#include __BEGIN_DECLS void rgb_led(int r, int g, int b, int freqs); diff --git a/src/drivers/boards/px4esc-v1/bootloader/led.h b/src/drivers/boards/px4esc-v1/bootloader/led.h index d00935a954..b68e4aa70d 100644 --- a/src/drivers/boards/px4esc-v1/bootloader/led.h +++ b/src/drivers/boards/px4esc-v1/bootloader/led.h @@ -31,7 +31,6 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ -#include __BEGIN_DECLS void rgb_led(int r, int g, int b, int freqs); diff --git a/src/drivers/boards/px4flow-v2/bootloader/led.h b/src/drivers/boards/px4flow-v2/bootloader/led.h index d00935a954..b68e4aa70d 100644 --- a/src/drivers/boards/px4flow-v2/bootloader/led.h +++ b/src/drivers/boards/px4flow-v2/bootloader/led.h @@ -31,7 +31,6 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ -#include __BEGIN_DECLS void rgb_led(int r, int g, int b, int freqs); diff --git a/src/drivers/boards/zubaxgnss-v1/bootloader/led.h b/src/drivers/boards/zubaxgnss-v1/bootloader/led.h index c45e51684d..feb033eaea 100644 --- a/src/drivers/boards/zubaxgnss-v1/bootloader/led.h +++ b/src/drivers/boards/zubaxgnss-v1/bootloader/led.h @@ -32,7 +32,6 @@ * ****************************************************************************/ -#include #include __BEGIN_DECLS diff --git a/src/drivers/bootloaders/src/sched/timer.c b/src/drivers/bootloaders/src/sched/timer.c index 44c9d20bd2..5730da4e87 100644 --- a/src/drivers/bootloaders/src/sched/timer.c +++ b/src/drivers/bootloaders/src/sched/timer.c @@ -45,7 +45,6 @@ #include -#include #include #include diff --git a/src/modules/muorb/adsp/px4muorb.hpp b/src/modules/muorb/adsp/px4muorb.hpp index e7c1ca7699..e9f039fdd1 100644 --- a/src/modules/muorb/adsp/px4muorb.hpp +++ b/src/modules/muorb/adsp/px4muorb.hpp @@ -32,7 +32,6 @@ ****************************************************************************/ #pragma once -#include #include extern "C" { diff --git a/src/modules/systemlib/err.h b/src/modules/systemlib/err.h index bc6e239476..b47a041daa 100644 --- a/src/modules/systemlib/err.h +++ b/src/modules/systemlib/err.h @@ -69,7 +69,6 @@ #include #include #include -#include "visibility.h" __BEGIN_DECLS diff --git a/src/modules/systemlib/visibility.h b/src/modules/systemlib/visibility.h deleted file mode 100644 index 2c6adc062e..0000000000 --- a/src/modules/systemlib/visibility.h +++ /dev/null @@ -1,62 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2012 PX4 Development Team. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/** - * @file visibility.h - * - * Definitions controlling symbol naming and visibility. - * - * This file is normally included automatically by the build system. - */ - -#ifndef __SYSTEMLIB_VISIBILITY_H -#define __SYSTEMLIB_VISIBILITY_H - -#ifdef __EXPORT -# undef __EXPORT -#endif -#define __EXPORT __attribute__ ((visibility ("default"))) - -#ifdef __PRIVATE -# undef __PRIVATE -#endif -#define __PRIVATE __attribute__ ((visibility ("hidden"))) - -#ifdef __cplusplus -# define __BEGIN_DECLS extern "C" { -# define __END_DECLS } -#else -# define __BEGIN_DECLS -# define __END_DECLS -#endif -#endif \ No newline at end of file diff --git a/src/modules/uORB/uORB.h b/src/modules/uORB/uORB.h index 0035e0fd44..ed2808ccc5 100644 --- a/src/modules/uORB/uORB.h +++ b/src/modules/uORB/uORB.h @@ -43,8 +43,6 @@ #include #include -// Hack until everything is using this header -#include /** * Object metadata. diff --git a/src/modules/uavcanesc/led.hpp b/src/modules/uavcanesc/led.hpp index d00935a954..b68e4aa70d 100644 --- a/src/modules/uavcanesc/led.hpp +++ b/src/modules/uavcanesc/led.hpp @@ -31,7 +31,6 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ -#include __BEGIN_DECLS void rgb_led(int r, int g, int b, int freqs); diff --git a/src/modules/uavcannode/led.hpp b/src/modules/uavcannode/led.hpp index d00935a954..b68e4aa70d 100644 --- a/src/modules/uavcannode/led.hpp +++ b/src/modules/uavcannode/led.hpp @@ -31,7 +31,6 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ -#include __BEGIN_DECLS void rgb_led(int r, int g, int b, int freqs); diff --git a/src/modules/uavcannode/resources.hpp b/src/modules/uavcannode/resources.hpp index 25e835f235..c0f7304ccf 100644 --- a/src/modules/uavcannode/resources.hpp +++ b/src/modules/uavcannode/resources.hpp @@ -31,7 +31,6 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ -#include __BEGIN_DECLS #if defined(CONFIG_NSH_LIBRARY) diff --git a/src/platforms/px4_log.h b/src/platforms/px4_log.h index 298276e2ef..7af9cf8488 100644 --- a/src/platforms/px4_log.h +++ b/src/platforms/px4_log.h @@ -38,7 +38,6 @@ #pragma once -#include #define _PX4_LOG_LEVEL_ALWAYS 0 #define _PX4_LOG_LEVEL_DEBUG 1 diff --git a/src/systemcmds/hardfault_log/hardfault_log.c b/src/systemcmds/hardfault_log/hardfault_log.c index 6b0dd3264f..47a3ab6921 100644 --- a/src/systemcmds/hardfault_log/hardfault_log.c +++ b/src/systemcmds/hardfault_log/hardfault_log.c @@ -54,7 +54,6 @@ #include #include -#include #include #include