diff options
| author | Lukas Larsson <[email protected]> | 2011-12-08 15:56:50 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-12-08 15:59:49 +0100 |
| commit | 7d79fd6eb57a073e58080d52e98881bd85f8fcc9 (patch) | |
| tree | badba945b18de02ab8b3f7e8ec1d6a8948529c8b /lib/erl_interface/src/legacy/global_names.c | |
| parent | 3323324c28d9102099b03e266f5c36aee0183f2c (diff) | |
| parent | f160ef80b3044b697f9f4714b02f52eb11fbdf33 (diff) | |
| download | otp-7d79fd6eb57a073e58080d52e98881bd85f8fcc9.tar.gz otp-7d79fd6eb57a073e58080d52e98881bd85f8fcc9.tar.bz2 otp-7d79fd6eb57a073e58080d52e98881bd85f8fcc9.zip | |
Merge branch 'lukas/bugs_and_tc_fixes'
* lukas/bugs_and_tc_fixes:
Fix test_server test makefile for windows
Only step pointer arity steps
Link with LIBS after ETHR_LIBS
Save +M<S>t data as true or false, not the number
Return true/false instead of num for +M<S>t info
Return correct format for info about sys_alloc
Add explanatory text for tc failure
OTP-9800
Diffstat (limited to 'lib/erl_interface/src/legacy/global_names.c')
| -rw-r--r-- | lib/erl_interface/src/legacy/global_names.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/erl_interface/src/legacy/global_names.c b/lib/erl_interface/src/legacy/global_names.c index 7333d94931..db1c3e6296 100644 --- a/lib/erl_interface/src/legacy/global_names.c +++ b/lib/erl_interface/src/legacy/global_names.c @@ -94,7 +94,7 @@ char **erl_global_names(int fd, int *count) if (!(names = malloc((arity * sizeof(char**)) + (size-index)))) return NULL; /* arity pointers first, followed by s */ - s = (char *)(names+arity+1); + s = (char *)(names+arity); if (count) *count = 0; for (i=0; i<arity; i++) { |