Gettext 1.11.5 compatibility.

[tinc] / system.h

diff --git a/system.h b/system.h
index 51adca0..6391c39 100644 (file)
--- a/system.h
+++ b/system.h
@@ -1,6 +1,6 @@
 /*
     system.h -- header for locale settings
-    Copyright (C) 1998,99,2000 Ivo Timmermans <itimmermans@bigfoot.com.com>
+    Copyright (C) 1998,99,2000 Ivo Timmermans <ivo@o2w.nl.com>
 
     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
@@ -20,26 +20,7 @@
 #ifndef __TINC_SYSTEM_H__
 #define __TINC_SYSTEM_H__
 
-/* Take care of NLS matters. -- from fileutils 4.0 */
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#if !HAVE_SETLOCALE
-# define setlocale(Category, Locale) /* empty */
-#endif
-
-#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
-#endif
-#define N_(Text) Text
+#include "gettext.h"
 
 #ifndef HAVE_STRSIGNAL
 # define strsignal(p) ""
@@ -48,5 +29,8 @@
 /* Other functions */
 #include <dropin.h>
 
-#endif /* __TINC_SYSTEM_H__ */
+#ifndef HAVE_SOCKLEN_T
+typedef int socklen_t;
+#endif
 
+#endif /* __TINC_SYSTEM_H__ */