diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-09-09 11:00:57 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-09-09 11:00:57 -0700 |
| commit | 953ebf768763fe93a0af76f5007d1f69f91d6440 (patch) | |
| tree | 8f730aba89278f06856275a4c6f7c226d8082f5a | |
| parent | 16d08db683538b82efcde288db7ec2224fdfd1cd (diff) | |
| parent | bf6bb1fa210dc0b6b93976dd0b4b4395f40a441d (diff) | |
Merge pull request #563 from mnaamani/networking
fixes needed to compile ENet networking library
| -rw-r--r-- | src/library.js | 2 | ||||
| -rw-r--r-- | system/include/sys/select.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/library.js b/src/library.js index 32186eac..d2d61867 100644 --- a/src/library.js +++ b/src/library.js @@ -5678,7 +5678,7 @@ LibraryManager.library = { // http://pubs.opengroup.org/onlinepubs/009695399/functions/times.html // NOTE: This is fake, since we can't calculate real CPU time usage in JS. if (buffer !== 0) { - memset(buffer, 0, ___tms_struct_layout.__size__); + _memset(buffer, 0, ___tms_struct_layout.__size__); } return 0; }, diff --git a/system/include/sys/select.h b/system/include/sys/select.h index 47cef2e5..49bc034b 100644 --- a/system/include/sys/select.h +++ b/system/include/sys/select.h @@ -1,3 +1,6 @@ +#ifndef _SELECT_H +#define _SELECT_H int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout); +#endif |