diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | c/common.cpp | 4 | ||||
-rw-r--r-- | c/common.h | 2 | ||||
-rw-r--r-- | c/main.cpp | 2 | ||||
-rw-r--r-- | c/pl.h | 4 |
5 files changed, 7 insertions, 7 deletions
@@ -4,7 +4,7 @@ PL = pl/cfg.pl pl/episode_data.pl pl/local_episodes.pl pl/track_episodes.pl CL = swipl-ld CLFLAGS = -DUNICODE -D_UNICODE -CLFLAGS += -cc-options,-std=c++17 -Wall -Wpedantic -O2 +CLFLAGS += -cc-options,-std=c++17 -Wall -Wextra -Wpedantic -O2 CLFLAGS += -ld-options,-mwindows -lcomctl32 -luxtheme all: showdeps b/$(EXE) diff --git a/c/common.cpp b/c/common.cpp index a5b7316..c04d986 100644 --- a/c/common.cpp +++ b/c/common.cpp @@ -58,7 +58,7 @@ Library::~Library() FreeLibrary(m_hModule); } -FARPROC Library::GetProcAddress(const char* const szProc) +void* Library::GetProcAddress(const char* const szProc) { - return ::GetProcAddress(m_hModule, szProc); + return (void*)::GetProcAddress(m_hModule, szProc); } @@ -27,7 +27,7 @@ struct Library { Library(const TCHAR* tszLibrary); ~Library(); - FARPROC GetProcAddress(const char* szProc); + void* GetProcAddress(const char* szProc); private: HMODULE m_hModule; }; @@ -474,7 +474,7 @@ LRESULT CALLBACK WndProc(const HWND hWnd, const UINT uMsg, const WPARAM wParam, return 0; } -INT_PTR CALLBACK AboutDlgProc(const HWND hWnd, const UINT uMsg, const WPARAM wParam, const LPARAM lParam) +INT_PTR CALLBACK AboutDlgProc(const HWND hWnd, const UINT uMsg, const WPARAM wParam, const LPARAM) { switch (uMsg) { case WM_CLOSE: @@ -57,9 +57,9 @@ int PlGetv(const term_t t, T arg) { return PlGet(t, arg); } template <typename T, typename ...R> int PlGetv(const term_t t, T arg, R... rest) { return PlGet(t, arg)? PlGetv(t+1, rest...): 0; } template <typename T> -int Countv(const int i, T arg) { return i+1; } +int Countv(const int i, T) { return i+1; } template <typename T, typename ...R> -int Countv(const int i, T arg, R... rest) { return Countv(i+1, rest...); } +int Countv(const int i, T, R... rest) { return Countv(i+1, rest...); } /* Call Prolog predicate, propagating Prolog exceptions. */ template <typename ...T> |