summaryrefslogtreecommitdiff
path: root/nuttx/net
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-04-16 01:04:17 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-04-16 01:04:17 +0000
commit4264cfb4e8ab918f350dc625019b8492cc8d9e40 (patch)
treef6c80ca59449872801c0050b6cdb5bf3ed27299b /nuttx/net
parentf59a457ba7da70e76fdba829f1b17764dbc1d486 (diff)
downloadpx4-nuttx-4264cfb4e8ab918f350dc625019b8492cc8d9e40.tar.gz
px4-nuttx-4264cfb4e8ab918f350dc625019b8492cc8d9e40.tar.bz2
px4-nuttx-4264cfb4e8ab918f350dc625019b8492cc8d9e40.zip
Fix bad conditional compilation that breaks THTTPD and dup2()
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3511 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net')
-rw-r--r--nuttx/net/net_dup2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/net/net_dup2.c b/nuttx/net/net_dup2.c
index da7ab9d70..b27bb6967 100644
--- a/nuttx/net/net_dup2.c
+++ b/nuttx/net/net_dup2.c
@@ -1,7 +1,7 @@
/****************************************************************************
* net/net_dup2.c
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,7 @@
*
****************************************************************************/
-#if CONFIG_NFILE_DESCRIPTOR > 0
+#if CONFIG_NFILE_DESCRIPTORS > 0
int net_dup2(int sockfd1, int sockfd2)
#else
int dup2(int sockfd1, int sockfd2)