gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / lib / printf.c

diff --git a/lib/printf.c b/lib/printf.c
index c48042a..ad1f24d 100644 (file)
--- a/lib/printf.c
+++ b/lib/printf.c
@@ -1,5 +1,5 @@
 /* Formatted output to a stream.
-   Copyright (C) 2007, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2010-2013 Free Software Foundation, Inc.
 
    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
@@ -23,8 +23,6 @@
 
 #include <stdarg.h>
 
-#if !DEPENDS_ON_LIBINTL /* avoid collision with intl/printf.c */
-
 /* Print formatted output to standard output.
    Return string length of formatted string.  On error, return a negative
    value.  */
@@ -40,5 +38,3 @@ printf (const char *format, ...)
 
   return retval;
 }
-
-#endif