Ooops, looks like my diff was backwards. Here's a new try.
1141c1141 < #ifdef USING_V4L --- > #if defined(USING_V4L) || defined(USING_V4L2) 1143a1144 > #ifdef USING_V4L 1325a1327 > #endif 1728a1731 > #ifdef USING_V4L 1860a1864 > #endif 1863c1867 < #else // USING_V4L --- > #else // USING_V4L || USING_V4L2 1868c1872 < #endif // USING_V4L --- > #endif // USING_V4L || USING_V4L2
Ooops, looks like my diff was backwards. Here's a new try.
1141c1141
< #ifdef USING_V4L
---
> #if defined(USING_V4L) || defined(USING_V4L2)
1143a1144
> #ifdef USING_V4L
1325a1327
> #endif
1728a1731
> #ifdef USING_V4L
1860a1864
> #endif
1863c1867
< #else // USING_V4L
---
> #else // USING_V4L || USING_V4L2
1868c1872
< #endif // USING_V4L
---
> #endif // USING_V4L || USING_V4L2