diff options
author | Dan Gudmundsson <[email protected]> | 2015-06-09 09:37:34 +0200 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2015-06-09 09:37:34 +0200 |
commit | bbd68fb2f45ec2089d6f1bbffd2601bf776aa267 (patch) | |
tree | 029c2c77b7d399e49e02b13a12f906c3d9606b7f /lib/wx/c_src/wxe_gl.h | |
parent | 798219edd8adf36dbcc02ce9c9de71685da85d64 (diff) | |
parent | 38cb91a91ac2d8f3231761b98909ff89416a4942 (diff) | |
download | otp-bbd68fb2f45ec2089d6f1bbffd2601bf776aa267.tar.gz otp-bbd68fb2f45ec2089d6f1bbffd2601bf776aa267.tar.bz2 otp-bbd68fb2f45ec2089d6f1bbffd2601bf776aa267.zip |
Merge branch 'dgud/wx/float-return'
* dgud/wx/float-return:
wx: Optimize binary args
wx: Driver lock cleanup
wx: Optimize event and return value construction
wx: Cleanup tests
wx: Fix bad float in return values
Diffstat (limited to 'lib/wx/c_src/wxe_gl.h')
-rw-r--r-- | lib/wx/c_src/wxe_gl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/c_src/wxe_gl.h b/lib/wx/c_src/wxe_gl.h index dc117bf610..69095036a0 100644 --- a/lib/wx/c_src/wxe_gl.h +++ b/lib/wx/c_src/wxe_gl.h @@ -26,8 +26,8 @@ void activateGL(ErlDrvTermData caller); void setActiveGL(ErlDrvTermData caller, wxGLCanvas *canvas); void deleteActiveGL(wxGLCanvas *canvas); -void wxe_initOpenGL(wxeReturn, char*); -void gl_dispatch(int op, char *bp, ErlDrvTermData caller, WXEBinRef *bins[]); +void wxe_initOpenGL(wxeReturn *, char*); +void gl_dispatch(int op, char *bp, ErlDrvTermData caller, WXEBinRef *bins); WX_DECLARE_HASH_MAP(ErlDrvTermData, wxGLCanvas*, wxIntegerHash, wxIntegerEqual, wxeGLC); extern wxeGLC glc; |