aboutsummaryrefslogtreecommitdiffstats
path: root/lib/erl_interface
diff options
context:
space:
mode:
authorCalvin <[email protected]>2019-03-21 08:29:08 -0400
committerCalvin <[email protected]>2019-05-29 06:21:43 -0400
commit8a0c0ae7defd1e9f5d41a88de8c3dc8a544a7c73 (patch)
treec41522e24a2086ed125ba3ee075c61cc4a4edfb7 /lib/erl_interface
parent3c8f6be7d1eba07c52312a4fbd7257850c7a7c05 (diff)
downloadotp-8a0c0ae7defd1e9f5d41a88de8c3dc8a544a7c73.tar.gz
otp-8a0c0ae7defd1e9f5d41a88de8c3dc8a544a7c73.tar.bz2
otp-8a0c0ae7defd1e9f5d41a88de8c3dc8a544a7c73.zip
fix names conflicting with AIX system names
quick and dirty renaming. the reason why is because AIX has some network function names prefixed with "n" for spec compliant versions, and the unprefixed versions are just redfined or are wrappers. as such, rename the erts/ei functions with these names. fixes compile on IBM i 7.3
Diffstat (limited to 'lib/erl_interface')
-rw-r--r--lib/erl_interface/include/ei.h2
-rw-r--r--lib/erl_interface/src/misc/ei_portio.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/erl_interface/include/ei.h b/lib/erl_interface/include/ei.h
index b138118f04..ca235e2cd1 100644
--- a/lib/erl_interface/include/ei.h
+++ b/lib/erl_interface/include/ei.h
@@ -329,7 +329,7 @@ typedef struct {
int (*socket)(void **ctx, void *setup_ctx);
int (*close)(void *ctx);
int (*listen)(void *ctx, void *addr, int *len, int backlog);
- int (*accept)(void **ctx, void *addr, int *len, unsigned tmo);
+ int (*accept_ei)(void **ctx, void *addr, int *len, unsigned tmo);
int (*connect)(void *ctx, void *addr, int len, unsigned tmo);
int (*writev)(void *ctx, const void *iov, int iovcnt, ssize_t *len, unsigned tmo);
int (*write)(void *ctx, const char *buf, ssize_t *len, unsigned tmo);
diff --git a/lib/erl_interface/src/misc/ei_portio.c b/lib/erl_interface/src/misc/ei_portio.c
index bccc86c1b1..caa3d270a8 100644
--- a/lib/erl_interface/src/misc/ei_portio.c
+++ b/lib/erl_interface/src/misc/ei_portio.c
@@ -622,7 +622,7 @@ int ei_accept_ctx_t__(ei_socket_callbacks *cbs, void **ctx,
} while (error == EINTR);
}
do {
- error = cbs->accept(ctx, addr, len, ms);
+ error = cbs->accept_ei(ctx, addr, len, ms);
} while (error == EINTR);
return error;
}