Fixed bad merge artifacts

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp

@@ -59,14 +59,11 @@ static int writer_main(int argc, char *argv[])
 {
 	char buf[1];
 
-	int fd = px4_open(TESTDEV, PX4_F_WRONLY);
-
 	int fd = px4_open(TESTDEV, PX4_F_WRONLY);
 	if (fd < 0) {
 		PX4_INFO("Writer: Open failed %d %d", fd, px4_errno);
 		return -px4_errno;
 	}
-src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
 
 	int ret;
 	int i = 0;
@@ -94,16 +91,10 @@ src/platforms/posix/tests/vcdev_test/vcdevtest_example.cpp
 
 class PrivData
 {
-	PrivData() : _read_offset(0) {}
-	~PrivData() {}
-	
-	size_t _read_offset;
-};
-	
 public:
 	PrivData() : _read_offset(0) {}
 	~PrivData() {}
-
+	
 	size_t _read_offset;
 };
 

src/platforms/px4_posix.h

@@ -77,20 +77,10 @@ typedef sem_t px4_sem_t;
 
 #define px4_sem_init	 sem_init
 #define px4_sem_wait	 sem_wait
-
 #define px4_sem_post	 sem_post
 #define px4_sem_getvalue sem_getvalue
 #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
 __EXPORT int		px4_sem_timedwait(px4_sem_t *sem, const struct timespec *abstime);
 #else