USB: remove BUILD_RAW and CALLBACK define

This commit is contained in:
jackun 2020-11-18 09:38:15 +02:00
parent b5e561e68f
commit 7a5f9e80e7
3 changed files with 3 additions and 17 deletions

View File

@ -60,9 +60,4 @@ s64 get_clock();
/* usb-pad-raw.cpp */
#if _WIN32
extern HWND gsWnd;
#if defined(BUILD_RAW)
extern HWND msgWindow;
int InitWindow(HWND);
void UninitWindow();
#endif
#endif

View File

@ -25,14 +25,6 @@
#endif
#endif
#ifdef _WIN32
#define CALLBACK __stdcall
#elif defined(__i386__)
#define CALLBACK __attribute__((stdcall))
#else
#define CALLBACK
#endif
#ifndef EXPORT_C_
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" type CALLBACK

View File

@ -17,7 +17,7 @@
#include "shared_usb.h"
#include <stdexcept>
#if defined(BUILD_RAW)
#ifdef _WIN32
#include "rawinput_usb.h"
#endif
@ -26,8 +26,7 @@ namespace shared
void Initialize(void* ptr)
{
// Keeping it simple, for now
#if defined(BUILD_RAW)
#ifdef _WIN32
if (!shared::rawinput::Initialize(ptr))
throw std::runtime_error("Failed to initialize raw input!");
#endif
@ -35,7 +34,7 @@ namespace shared
void Uninitialize(/*void *ptr*/)
{
#if defined(BUILD_RAW)
#ifdef _WIN32
shared::rawinput::Uninitialize(/*ptr*/);
#endif
}