[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libcvd-members] libcvd/cvd_src/Linux dvbuffer3_dc1394v2.cc
From: |
Gerhard Reitmayr |
Subject: |
[libcvd-members] libcvd/cvd_src/Linux dvbuffer3_dc1394v2.cc |
Date: |
Tue, 20 Apr 2010 16:08:12 +0000 |
CVSROOT: /cvsroot/libcvd
Module name: libcvd
Changes by: Gerhard Reitmayr <gerhard> 10/04/20 16:08:11
Modified files:
cvd_src/Linux : dvbuffer3_dc1394v2.cc
Log message:
changed define to select OSX code
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/Linux/dvbuffer3_dc1394v2.cc?cvsroot=libcvd&r1=1.12&r2=1.13
Patches:
Index: dvbuffer3_dc1394v2.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/Linux/dvbuffer3_dc1394v2.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- dvbuffer3_dc1394v2.cc 30 Mar 2010 15:08:06 -0000 1.12
+++ dvbuffer3_dc1394v2.cc 20 Apr 2010 16:08:11 -0000 1.13
@@ -23,7 +23,7 @@
#include <cvd/Linux/dvbuffer3.h>
#include <cvd/byte.h>
#include <dc1394/dc1394.h>
-#ifndef DARWIN
+#ifndef __APPLE__
#include <libraw1394/raw1394.h>
#endif
#include <vector>
@@ -579,7 +579,7 @@
delete mpLDCP;
}
-#ifndef DARWIN
+#ifndef __APPLE__
void RawDVBuffer3::stopAllTransmissions(void)
{
raw1394handle_t rawhandle = raw1394_new_handle();
@@ -594,7 +594,7 @@
}
raw1394_destroy_handle(rawhandle);
}
-#endif //DARWIN
+#endif //__APPLE__
bool RawDVBuffer3::frame_pending()
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libcvd-members] libcvd/cvd_src/Linux dvbuffer3_dc1394v2.cc,
Gerhard Reitmayr <=