aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2017-04-28 10:13:10 +0200
committerDan Gudmundsson <[email protected]>2017-04-28 10:13:10 +0200
commit0ca63ae3fa7bee0920d7a9f77a8a79f265d899a4 (patch)
treeab61f0d9ddcb17c1350845350bfe1effba3fbe52 /lib
parentb3844e8e927a533c4666787eb9a9adbafdc3dd44 (diff)
parenta64c4d806fa54848c35632114585ad82b98712e8 (diff)
downloadotp-0ca63ae3fa7bee0920d7a9f77a8a79f265d899a4.tar.gz
otp-0ca63ae3fa7bee0920d7a9f77a8a79f265d899a4.tar.bz2
otp-0ca63ae3fa7bee0920d7a9f77a8a79f265d899a4.zip
Merge branch 'dgud/wx/pr/1425'
* dgud/wx/pr/1425: wxe_impl.cpp: pointer comparison fix
Diffstat (limited to 'lib')
-rw-r--r--lib/wx/c_src/wxe_impl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp
index 05d56667ab..90cd35455a 100644
--- a/lib/wx/c_src/wxe_impl.cpp
+++ b/lib/wx/c_src/wxe_impl.cpp
@@ -672,7 +672,7 @@ void * WxeApp::getPtr(char * bp, wxeMemEnv *memenv) {
throw wxe_badarg(index);
}
void * temp = memenv->ref2ptr[index];
- if((index < memenv->next) && ((index == 0) || (temp > NULL)))
+ if((index < memenv->next) && ((index == 0) || (temp != (void *)NULL)))
return temp;
else {
throw wxe_badarg(index);
@@ -684,7 +684,7 @@ void WxeApp::registerPid(char * bp, ErlDrvTermData pid, wxeMemEnv * memenv) {
if(!memenv)
throw wxe_badarg(index);
void * temp = memenv->ref2ptr[index];
- if((index < memenv->next) && ((index == 0) || (temp > NULL))) {
+ if((index < memenv->next) && ((index == 0) || (temp != (void *) NULL))) {
ptrMap::iterator it;
it = ptr2ref.find(temp);
if(it != ptr2ref.end()) {