diff options
| author | Benny Prijono <bennylp@teluu.com> | 2008-02-08 15:21:41 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2008-02-08 15:21:41 +0000 |
| commit | a2ca31f0f6e30a30bf6f6e58ab423b370fbc9bb3 (patch) | |
| tree | 91f32fd6efde69f16bafb4149ea4566f4fd8e789 /pjlib/src | |
| parent | c25c92ec0bdb07c94d13e833e0cb7dffc86de0d3 (diff) | |
More ticket #472: Fixed problem when building on Mingw. Now PJ_FD_SETSIZE_SETABLE is only enabled when winsock.h is present
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1788 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src')
| -rw-r--r-- | pjlib/src/pj/ioqueue_select.c | 8 | ||||
| -rw-r--r-- | pjlib/src/pj/sock_select.c | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pjlib/src/pj/ioqueue_select.c b/pjlib/src/pj/ioqueue_select.c index 4bf11471..7738f668 100644 --- a/pjlib/src/pj/ioqueue_select.c +++ b/pjlib/src/pj/ioqueue_select.c @@ -38,6 +38,14 @@ #include <pj/sock_select.h> #include <pj/errno.h> +/* Now that we have access to OS'es <sys/select>, lets check again that + * PJ_IOQUEUE_MAX_HANDLES is not greater than FD_SETSIZE + */ +#if PJ_IOQUEUE_MAX_HANDLES > FD_SETSIZE +# error "PJ_IOQUEUE_MAX_HANDLES cannot be greater than FD_SETSIZE" +#endif + + /* * Include declaration from common abstraction. */ diff --git a/pjlib/src/pj/sock_select.c b/pjlib/src/pj/sock_select.c index b3743b93..566050ef 100644 --- a/pjlib/src/pj/sock_select.c +++ b/pjlib/src/pj/sock_select.c @@ -35,13 +35,6 @@ # pragma warning(disable: 4389) // Signed/unsigned mismatch in FD_* #endif -/* Now that we have access to OS'es <sys/select>, lets check again that - * PJ_IOQUEUE_MAX_HANDLES is not greater than FD_SETSIZE - */ -#if PJ_IOQUEUE_MAX_HANDLES > FD_SETSIZE -# error "PJ_IOQUEUE_MAX_HANDLES cannot be greater than FD_SETSIZE" -#endif - #define PART_FDSET(ps) ((fd_set*)&ps->data[1]) #define PART_FDSET_OR_NULL(ps) (ps ? PART_FDSET(ps) : NULL) #define PART_COUNT(ps) (ps->data[0]) |