From b6d9756c5e0c4d01cf034c38f95b0de64145f214 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 30 Mar 2023 01:05:56 +1100 Subject: Bump version to 0.253 --- android-project/app/src/main/AndroidManifest.xml | 4 ++-- makefile | 4 ++-- src/osd/modules/input/input_dinput.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index c4cd2075bd3..323f4cec484 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/makefile b/makefile index 9e58548ad15..8deb9cc19d6 100644 --- a/makefile +++ b/makefile @@ -1561,7 +1561,7 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.252"' > $@ + @echo '#define BARE_BUILD_VERSION "0.253"' > $@ @echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char bare_vcs_revision[];' >> $@ @@ -1571,7 +1571,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) @echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@ else $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.252" > $@ + @echo #define BARE_BUILD_VERSION "0.253" > $@ @echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_vcs_revision[]; >> $@ diff --git a/src/osd/modules/input/input_dinput.h b/src/osd/modules/input/input_dinput.h index b7fc942aaec..98fdfb011bb 100644 --- a/src/osd/modules/input/input_dinput.h +++ b/src/osd/modules/input/input_dinput.h @@ -90,7 +90,7 @@ public: { return m_dinput->EnumDevices( devclass, - &di_emun_devices_cb >, + &di_enum_devices_cb >, LPVOID(&callback), DIEDFL_ATTACHEDONLY); } @@ -123,7 +123,7 @@ private: static std::string make_id(LPCDIDEVICEINSTANCE instance); template - static BOOL CALLBACK di_emun_devices_cb(LPCDIDEVICEINSTANCE instance, LPVOID ref) + static BOOL CALLBACK di_enum_devices_cb(LPCDIDEVICEINSTANCE instance, LPVOID ref) { return (*reinterpret_cast(ref))(instance); } -- cgit v1.2.3