diff options
| author | Dan Gudmundsson <[email protected]> | 2013-01-25 15:56:56 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-01-25 15:56:56 +0100 |
| commit | 76648221ddada894b5442c490ea3d9e909320d86 (patch) | |
| tree | de8016ed3c9cd40c1098d784ccdcacc0884b6d54 /lib/wx/c_src/wxe_driver.h | |
| parent | 697e9178b8c9dc825e221f2750afac516478976a (diff) | |
| parent | fd745d01d7efcb11af434acbdbdf2bac11d039c0 (diff) | |
| download | otp-76648221ddada894b5442c490ea3d9e909320d86.tar.gz otp-76648221ddada894b5442c490ea3d9e909320d86.tar.bz2 otp-76648221ddada894b5442c490ea3d9e909320d86.zip | |
Merge branch 'dgud/wx/depr-driver-if'
* dgud/wx/depr-driver-if:
Document howto build wxWidgets on mac
wx: Fix crash in glu tesselate
wx: Remove deprecated driver_send_term usage
wx: Removed wx internal event
Diffstat (limited to 'lib/wx/c_src/wxe_driver.h')
| -rw-r--r-- | lib/wx/c_src/wxe_driver.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/wx/c_src/wxe_driver.h b/lib/wx/c_src/wxe_driver.h index 5c5b8614ed..c765c866c2 100644 --- a/lib/wx/c_src/wxe_driver.h +++ b/lib/wx/c_src/wxe_driver.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2008-2010. All Rights Reserved. + * Copyright Ericsson AB 2008-2013. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -43,7 +43,8 @@ typedef struct wxe_bin_ref { typedef struct wxe_data_def { void * driver_data; WXEBinRef * bin; /* Argument binaries */ - ErlDrvPort port; + ErlDrvPort port_handle; + ErlDrvTermData port; int is_cbport; ErlDrvPDL pdl; } wxe_data; @@ -67,8 +68,9 @@ void meta_command(int what, wxe_data *sd); void * wxe_ps_init(); -extern ErlDrvPort WXE_DRV_PORT; -extern int wxe_debug; +extern ErlDrvPort WXE_DRV_PORT_HANDLE; +extern ErlDrvTermData WXE_DRV_PORT; +extern int wxe_debug; extern char * erl_wx_privdir; |