Moved 1.9 branch to trunk

1 files changed, 19 insertions, 13 deletions

diff --git a/mpi/mpi-inline.c b/agent/trans.c
index 8e29b0615..5eb7d25c0 100644
--- a/mpi/mpi-inline.c
+++ b/agent/trans.c
@@ -1,5 +1,5 @@
-/* mpi-inline.c
- * Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+/* trans.c - translatable strings
+ *	Copyright (C) 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -19,19 +19,25 @@
  * USA.
  */
 
+/* To avoid any problems with the gettext implementation (there used
+   to be some vulnerabilities in the last years and the use of
+   external files is a minor security problem in itself), we use our
+   own simple translation stuff */
+
 #include <config.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <assert.h>
+#include <unistd.h>
+#include <sys/stat.h>
 
-/* put the inline functions as real functions into the lib */
-#define G10_MPI_INLINE_DECL
-
-#include "mpi-internal.h"
-
-/* always include the header becuase it is only
- * included by mpi-internal if __GCC__ is defined but we
- * need it here in all cases and the above definition of
- * of the macro allows us to do so
- */
-#include "mpi-inline.h"
+#include "agent.h"
 
+const char *
+trans (const char *text)
+{
+  return text;
+}