diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-01-04 18:24:31 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-01-04 18:24:31 +0100 |
| commit | a69fb329f36b8c76b5bf5d2819e66b481e5a8b7f (patch) | |
| tree | 2bcef4f81b6325a6de8d24a19e6a360ca3db6b6b /erts/emulator/beam/erl_driver.h | |
| parent | 7f2cd602577646e927c60cf381e88246e6ecee96 (diff) | |
| parent | f9ca630a95e1e2adb1b225bfb69e3101678183f3 (diff) | |
| download | otp-a69fb329f36b8c76b5bf5d2819e66b481e5a8b7f.tar.gz otp-a69fb329f36b8c76b5bf5d2819e66b481e5a8b7f.tar.bz2 otp-a69fb329f36b8c76b5bf5d2819e66b481e5a8b7f.zip | |
Merge branch 'maint'
* maint:
erts: Use re instead of regexp in testsuite
erts: Remove unused code in testsuites
orber: Use modern list guard in testsuite
orber: Ignore unused variable in orber_tb.erl
xmerl: Ignore unused variable in xmerl_uri.erl
syntax_tool: Add missing type information
hipe: Suppress warnings for unused variables
hipe: Add type information to cfg_info record
tools: Use literal formatting in erl_memory.c
asn1: Remove unused variable in asn1_erl_nif.c
ei: Remove unused variable in ei_format.c
erts: Add missing prototype to DRIVER_INIT
runtime_tools: Fix signedness in trace_ip_drv.c
to_erl: Remove compiler warnings
heart: Suppress compiler warnings
erts: Remove compiler warnings in inet_gethost.c
erts: Remove dead code in inet_gethost.c
erts: Remove dead code
Diffstat (limited to 'erts/emulator/beam/erl_driver.h')
| -rw-r--r-- | erts/emulator/beam/erl_driver.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_driver.h b/erts/emulator/beam/erl_driver.h index e80eae0b86..7510f6b724 100644 --- a/erts/emulator/beam/erl_driver.h +++ b/erts/emulator/beam/erl_driver.h @@ -371,11 +371,17 @@ typedef struct erl_drv_entry { #ifndef ERL_DRIVER_TYPES_ONLY #if defined(VXWORKS) -# define DRIVER_INIT(DRIVER_NAME) ErlDrvEntry* DRIVER_NAME ## _init(void) +# define DRIVER_INIT(DRIVER_NAME) \ + ErlDrvEntry* DRIVER_NAME ## _init(void); \ + ErlDrvEntry* DRIVER_NAME ## _init(void) #elif defined(__WIN32__) -# define DRIVER_INIT(DRIVER_NAME) __declspec(dllexport) ErlDrvEntry* driver_init(void) +# define DRIVER_INIT(DRIVER_NAME) \ + __declspec(dllexport) ErlDrvEntry* driver_init(void); \ + __declspec(dllexport) ErlDrvEntry* driver_init(void) #else -# define DRIVER_INIT(DRIVER_NAME) ErlDrvEntry* driver_init(void) +# define DRIVER_INIT(DRIVER_NAME) \ + ErlDrvEntry* driver_init(void); \ + ErlDrvEntry* driver_init(void) #endif /* |