diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 0c11a0fb5819cb490e60abefdb3042343f042a3c..65b199dfa697c545c3bea1ca4ab5aa38b35c7890 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-04  Uros Bizjak  <ubizjak@gmail.com>
+
+	* traditional.c (_cpp_scan_out_logical_line): Initialize
+	fmacro.args, fmacro.node, fmacro.offset, fmacro.line and
+	fmacro.args to prevent 'may be used uninitialized' warning.
+
 2007-07-03  Uros Bizjak  <ubizjak@gmail.com>
 
 	* include/cpplib.h (CPP_N_WIDTH_MD, CPP_N_MD_W, CPP_N_MD_Q):
diff --git a/libcpp/traditional.c b/libcpp/traditional.c
index a543348d9e6971a5957d0abd56e9a67b63b8e65b..7ca3cfd92960abcc255f7279faa76000679e153c 100644
--- a/libcpp/traditional.c
+++ b/libcpp/traditional.c
@@ -1,5 +1,5 @@
 /* CPP Library - traditional lexical analysis and macro expansion.
-   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005, 2007 Free Software Foundation, Inc.
    Contributed by Neil Booth, May 2002
 
 This program is free software; you can redistribute it and/or modify it
@@ -353,6 +353,11 @@ _cpp_scan_out_logical_line (cpp_reader *pfile, cpp_macro *macro)
   const uchar *start_of_input_line;
 
   fmacro.buff = NULL;
+  fmacro.args = NULL;
+  fmacro.node = NULL;
+  fmacro.offset = 0;
+  fmacro.line = 0;
+  fmacro.argc = 0;
 
   quote = 0;
   header_ok = pfile->state.angled_headers;