diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-01-10 13:38:46 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-01-10 13:38:46 +1030 |
| commit | 38bf01bd1c925614a6e67a38aa3cefc7b8fe3bca (patch) | |
| tree | 9216fdf840d72611037d0806c482598941445d1e /os | |
| parent | 4e85c7c322faf14c14e4229fa294b8e3d3a4d304 (diff) | |
| parent | 0883e838e25227f0af84d2a90979175724166d16 (diff) | |
Merge branch 'master' into mpx
Diffstat (limited to 'os')
| -rw-r--r-- | os/connection.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/os/connection.c b/os/connection.c index 3b5742c2b..8b6541ce6 100644 --- a/os/connection.c +++ b/os/connection.c @@ -353,7 +353,8 @@ InitConnectionLimits(void) #endif #if !defined(WIN32) - ConnectionTranslation = (int *)xnfalloc(sizeof(int)*(lastfdesc + 1)); + if (!ConnectionTranslation) + ConnectionTranslation = (int *)xnfalloc(sizeof(int)*(lastfdesc + 1)); #else InitConnectionTranslation(); #endif |