fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 11:43:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bad merge artifacts

Browse Source 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2016-02-19 16:59:42 +01:00
committed by Julian Oes
parent 0c42c469af
commit ff1a38dba6
2 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
+1 -10
View File
@@ -59,14 +59,11 @@ static int writer_main(int argc, char *argv[])
{ {
char buf[1]; char buf[1];
int fd = px4_open(TESTDEV, PX4_F_WRONLY);
int fd = px4_open(TESTDEV, PX4_F_WRONLY); int fd = px4_open(TESTDEV, PX4_F_WRONLY);
if (fd < 0) { if (fd < 0) {
PX4_INFO("Writer: Open failed %d %d", fd, px4_errno); PX4_INFO("Writer: Open failed %d %d", fd, px4_errno);
return -px4_errno; return -px4_errno;
} }
src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
int ret; int ret;
int i = 0; int i = 0;
@@ -94,16 +91,10 @@ src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
class PrivData class PrivData
{ {
PrivData() : _read_offset(0) {}
~PrivData() {}
size_t _read_offset;
};
public: public:
PrivData() : _read_offset(0) {} PrivData() : _read_offset(0) {}
~PrivData() {} ~PrivData() {}
size_t _read_offset; size_t _read_offset;
}; };
src/platforms/px4_posix.h
-10
View File
@@ -77,20 +77,10 @@ typedef sem_t px4_sem_t;
#define px4_sem_init sem_init #define px4_sem_init sem_init
#define px4_sem_wait sem_wait #define px4_sem_wait sem_wait
#define px4_sem_post sem_post #define px4_sem_post sem_post
#define px4_sem_getvalue sem_getvalue #define px4_sem_getvalue sem_getvalue
#define px4_sem_destroy sem_destroy #define px4_sem_destroy sem_destroy
#if 0
// TODO: Implement this function or remove it from the implementation.
// #define px4_sem_timedwait sem_timedwait
inline int px4_sem_timedwait(px4_sem_t *sem, const struct timespec *abstime)
{
return -1;
}
#endif
#ifdef __PX4_QURT #ifdef __PX4_QURT
__EXPORT int px4_sem_timedwait(px4_sem_t *sem, const struct timespec *abstime); __EXPORT int px4_sem_timedwait(px4_sem_t *sem, const struct timespec *abstime);
#else #else