Merge pull request #2256 from mcharleb/fixes-for-gcc

Fixes for gcc 4.8
PX4 · Jun 2, 2015 · 00fc4b5 · 00fc4b5
2 parents e32c00b + ca88251
commit 00fc4b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/modules/simulator/simulator_mavlink.cpp b/src/modules/simulator/simulator_mavlink.cpp
@@ -104,7 +104,7 @@ static void fill_manual_control_sp_msg(struct manual_control_setpoint_s *manual,
 	manual->z = man_msg->z / 1000.0f;
 }
 
-void fill_sensors_from_imu_msg(struct sensor_combined_s *sensor, mavlink_hil_sensor_t *imu) {
+static void fill_sensors_from_imu_msg(struct sensor_combined_s *sensor, mavlink_hil_sensor_t *imu) {
 	hrt_abstime timestamp = hrt_absolute_time();
 	sensor->timestamp = timestamp;
 	sensor->gyro_raw[0] = imu->xgyro * 1000.0f;

diff --git a/src/platforms/posix/px4_layer/px4_posix_tasks.cpp b/src/platforms/posix/px4_layer/px4_posix_tasks.cpp
@@ -273,6 +273,7 @@ void px4_show_tasks()
 }
 
 __BEGIN_DECLS
+const char *getprogname();
 const char *getprogname()
 {
         pthread_t pid = pthread_self();