Update of /cvsroot/tmux/tmux
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4229
Modified Files:
compat.h
Log Message:
And more.
Index: compat.h
===================================================================
RCS file: /cvsroot/tmux/tmux/compat.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- compat.h 27 Oct 2010 21:33:15 -0000 1.28
+++ compat.h 27 Oct 2010 21:34:59 -0000 1.29
@@ -16,6 +16,9 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifndef COMPAT_H
+#define COMPAT_H
+
#ifndef __GNUC__
#define __attribute__(a)
#endif
@@ -60,10 +63,6 @@
#include "compat/bitstring.h"
#endif
-#ifdef HAVE_GETOPT
-#include <getopt.h>
-#endif
-
#ifdef HAVE_CRYPT_H
#include <crypt.h>
#endif
@@ -227,7 +226,9 @@
int unsetenv(const char *);
#endif
-#ifndef HAVE_GETOPT
+#ifdef HAVE_GETOPT
+#include <getopt.h>
+#else
/* getopt.c */
extern int BSDopterr;
extern int BSDoptind;
@@ -242,3 +243,5 @@
#define optreset BSDoptreset
#define optarg BSDoptarg
#endif
+
+#endif /* COMPAT_H */
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
