From ace37c517e8ecfcab4c2da4258444f5331a6b921 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Fri, 9 Nov 2018 20:27:23 -0800
Subject: [PATCH] CameraServer: enable usb cameras on non-Linux platforms
 (#1411)

---
 .../src/main/native/cpp/cameraserver/CameraServer.cpp         | 4 ----
 .../src/main/native/include/cameraserver/CameraServer.h       | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp b/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
index 7a0847c2f6..d6ecac8101 100644
--- a/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
+++ b/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
@@ -55,7 +55,6 @@ static wpi::StringRef MakeSourceValue(CS_Source source,
   CS_Status status = 0;
   buf.clear();
   switch (cs::GetSourceKind(source, &status)) {
-#ifdef __linux__
     case cs::VideoSource::kUsb: {
       wpi::StringRef prefix{"usb:"};
       buf.append(prefix.begin(), prefix.end());
@@ -63,7 +62,6 @@ static wpi::StringRef MakeSourceValue(CS_Source source,
       buf.append(path.begin(), path.end());
       break;
     }
-#endif
     case cs::VideoSource::kHttp: {
       wpi::StringRef prefix{"ip:"};
       buf.append(prefix.begin(), prefix.end());
@@ -455,7 +453,6 @@ CameraServer::CameraServer() : m_impl(new Impl) {}
 
 CameraServer::~CameraServer() {}
 
-#ifdef __linux__
 cs::UsbCamera CameraServer::StartAutomaticCapture() {
   cs::UsbCamera camera = StartAutomaticCapture(m_impl->m_defaultUsbDevice++);
   auto csShared = GetCameraServerShared();
@@ -488,7 +485,6 @@ cs::UsbCamera CameraServer::StartAutomaticCapture(const wpi::Twine& name,
   csShared->ReportUsbCamera(camera.GetHandle());
   return camera;
 }
-#endif
 
 cs::AxisCamera CameraServer::AddAxisCamera(const wpi::Twine& host) {
   return AddAxisCamera("Axis Camera", host);
diff --git a/cameraserver/src/main/native/include/cameraserver/CameraServer.h b/cameraserver/src/main/native/include/cameraserver/CameraServer.h
index 261d84958d..ba65b2dcb0 100644
--- a/cameraserver/src/main/native/include/cameraserver/CameraServer.h
+++ b/cameraserver/src/main/native/include/cameraserver/CameraServer.h
@@ -36,8 +36,6 @@ class CameraServer {
    */
   static CameraServer* GetInstance();
 
-#ifdef __linux__
-  // USBCamera does not work on anything except Linux.
   /**
    * Start automatically capturing images to send to the dashboard.
    *
@@ -77,7 +75,6 @@ class CameraServer {
    */
   cs::UsbCamera StartAutomaticCapture(const wpi::Twine& name,
                                       const wpi::Twine& path);
-#endif
 
   /**
    * Start automatically capturing images to send to the dashboard from