X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=system.h;h=973869a1ff542348fcf1f5efd4735a2231f8e96b;hp=51adca0b785679c8ae34069a32e4483d69412426;hb=a227843b739d279b63adcf3736ebb03d856080c4;hpb=462ab530e546f5732dfd51134751da6f6910d679

diff --git a/system.h b/system.h
index 51adca0b..973869a1 100644
--- a/system.h
+++ b/system.h
@@ -1,6 +1,7 @@
 /*
-    system.h -- header for locale settings
-    Copyright (C) 1998,99,2000 Ivo Timmermans <itimmermans@bigfoot.com.com>
+    system.h -- system headers
+    Copyright (C) 1998-2005 Ivo Timmermans
+                  2003-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -12,41 +13,38 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #ifndef __TINC_SYSTEM_H__
 #define __TINC_SYSTEM_H__
 
-/* Take care of NLS matters. -- from fileutils 4.0 */
+#include "config.h"
 
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#if !HAVE_SETLOCALE
-# define setlocale(Category, Locale) /* empty */
-#endif
+#include "have.h"
 
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# undef bindtextdomain
-# define bindtextdomain(Domain, Directory) /* empty */
-# undef textdomain
-# define textdomain(Domain) /* empty */
-# define _(Text) Text
+#ifndef HAVE_STDBOOL_H
+typedef int bool;
+#define true 1
+#define false 0
 #endif
-#define N_(Text) Text
+
+/* Include localisation support */
+
+#include "gettext.h"
 
 #ifndef HAVE_STRSIGNAL
 # define strsignal(p) ""
 #endif
 
 /* Other functions */
-#include <dropin.h>
 
-#endif /* __TINC_SYSTEM_H__ */
+#include "dropin.h"
+
+#ifndef HAVE_SOCKLEN_T
+typedef int socklen_t;
+#endif
 
+#endif /* __TINC_SYSTEM_H__ */