summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/input/input_dinput.cpp
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2016-04-25 20:09:51 -0400
committer AJR <ajrhacker@users.noreply.github.com>2016-04-25 20:09:51 -0400
commit596678f2cd1b40c456db8f278a7f652c2a37da84 (patch)
treea4ffbdf51889f7a63ea7dc3da3afee4535987030 /src/osd/modules/input/input_dinput.cpp
parentec2669cacff2ec954ba351e09ba083c4e32b4ce4 (diff)
parente8326cdc3267591b635f4f97e5255e031ba6b834 (diff)
Merge remote-tracking branch 'upstream/master' into firstrun
Diffstat (limited to 'src/osd/modules/input/input_dinput.cpp')
-rw-r--r--src/osd/modules/input/input_dinput.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp
index dfb63482570..5aa925edefe 100644
--- a/src/osd/modules/input/input_dinput.cpp
+++ b/src/osd/modules/input/input_dinput.cpp
@@ -236,7 +236,7 @@ public:
instance.dwSize = sizeof(instance);
result = devinfo->dinput.device->GetObjectInfo(&instance, offset, DIPH_BYOFFSET);
- // if we got an error and have no default string, just return NULL
+ // if we got an error and have no default string, just return nullptr
if (result != DI_OK)
{
if (defstring == nullptr)