Back to fixing the Windows build.

Author: anntzer

.appveyor.yml

@@ -17,8 +17,10 @@ install:
     $Env:PATH = "C:\Miniconda36-x64;C:\Miniconda36-x64\Scripts;$Env:PATH"
     $Env:PYTHONUNBUFFERED = 1
     conda config --set always_yes true
+    conda update -n base conda
     conda update --quiet --all
     conda install --quiet matplotlib
+    pip install -U pip
     New-Item -ItemType directory build
     Set-Location build
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
@@ -31,7 +33,7 @@ install:
     pip uninstall -y .  # Just get the dependencies.
     python setup.py bdist_wheel
     pip install $(Get-Item dist\*.whl)
-      # end-syntax: ps1
+    # end-syntax: ps1
 
 test_script: |
   rem begin-syntax: dosbatch

src/_os.cpp

@@ -2,20 +2,25 @@
 
 #if defined __linux__ || defined __APPLE__
 #include <dlfcn.h>
+#else
+#include <Windows.h>
 #endif
 
 namespace mplcairo::os {
 
 #if defined __linux__ || defined __APPLE__
-void* dlopen(char const* filename) {
+using library_t = void*;
+using symbol_t = void*;
+
+library_t dlopen(char const* filename) {
   return ::dlopen(filename, RTLD_LAZY);
 }
 
-bool dlclose(void* handle) {
+bool dlclose(library_t handle) {
   return ::dlclose(handle);
 }
 
-void* dlsym(void* handle, char const* symbol) {
+symbol_t dlsym(library_t handle, char const* symbol) {
   return ::dlsym(handle, symbol);
 }
 
@@ -24,15 +29,18 @@ char const* dlerror() {
 }
 
 #elif _WIN32
-void* dlopen(char const* filename) {
+using library_t = HMODULE;
+using symbol_t = FARPROC;
+
+library_t dlopen(char const* filename) {
   return LoadLibrary(filename);
 }
 
-bool dlclose(void* handle) {
+bool dlclose(library_t handle) {
   return !FreeLibrary(handle);
 }
 
-void* dlsym(void* handle, char const* symbol) {
+symbol_t dlsym(library_t handle, char const* symbol) {
   return GetProcAddress(handle, symbol);
 }
 

src/_os.h

@@ -1,8 +1,19 @@
+#ifdef _WIN32
+#include <Windows.h>
+#endif
+
 namespace mplcairo::os {
 
-void* dlopen(char const* filename);
-bool dlclose(void* handle);
-void* dlsym(void* handle, char const* symbol);
+#if defined __linux__ || defined __APPLE__
+using library_t = void*;
+using symbol_t = void*;
+#elif defined _WIN32
+using library_t = HMODULE;
+using symbol_t = FARPROC;
+#endif
+library_t dlopen(char const* filename);
+bool dlclose(library_t handle);
+symbol_t dlsym(library_t handle, char const* symbol);
 char const* dlerror();
 
 }

src/_raqm.cpp

@@ -2,12 +2,14 @@
 #include "_os.h"
 #include "_macros.h"
 
+#include <stdexcept>
+
 namespace mplcairo {
 
 namespace raqm {
 
 namespace {
-void* _handle;
+os::library_t _handle;
 }
 
 #define DEFINE_API(name) decltype(raqm_##name)* name{};
@@ -23,7 +25,7 @@ void load_raqm() {
         "libraqm.so.0";
       #elif defined __APPLE__
         "libraqm.dylib";
-      #elif defined _win32
+      #elif defined _WIN32
         "libraqm";
       #endif
     raqm::_handle = os::dlopen(filename);