[poppler] cmake/modules configure.ac utils/parseargs.c utils/parseargs.h

[Albert Astals Cid]

 cmake/modules/PopplerMacros.cmake |    2 +-
 configure.ac                      |    2 +-
 utils/parseargs.c                 |   30 +++++++++++++++---------------
 utils/parseargs.h                 |   26 +++++++++++++-------------
 4 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit f346c1f6b55f87ebd6bb0b0932462d5514aa40ff
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Oct 9 00:29:06 2009 +0200

    add -ansi flag to default warnings

diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
index 239b6f3..a421f60 100644
--- a/cmake/modules/PopplerMacros.cmake
+++ b/cmake/modules/PopplerMacros.cmake
@@ -88,7 +88,7 @@ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
 if(CMAKE_COMPILER_IS_GNUCXX)
   # set the default compile warnings
   set(DEFAULT_COMPILE_WARNINGS_NO)
-  set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wno-write-strings")
+  set(DEFAULT_COMPILE_WARNINGS_YES "-ansi -Wall -Wno-write-strings")
   set(DEFAULT_COMPILE_WARNINGS_KDE "-Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
 
   set(CMAKE_CXX_FLAGS                "-Wnon-virtual-dtor -Woverloaded-virtual")
diff --git a/configure.ac b/configure.ac
index 2beb096..13d492a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -511,7 +511,7 @@ if test "x$GCC" != xyes; then
 fi
 case "$enable_compile_warnings" in
   no)	;;
-  yes)	CXXFLAGS="-Wall -Wno-write-strings -Woverloaded-virtual -Wnon-virtual-dtor $CXXFLAGS" ;;
+  yes)	CXXFLAGS="-Wall -Wno-write-strings -Woverloaded-virtual -Wnon-virtual-dtor -ansi $CXXFLAGS" ;;
   kde)	CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef -ansi \
 		-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align \
 		-Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith \
diff --git a/utils/parseargs.c b/utils/parseargs.c
index 8e84a9b..c5f3007 100644
--- a/utils/parseargs.c
+++ b/utils/parseargs.c
@@ -6,21 +6,21 @@
  * Copyright 1996-2003 Glyph & Cog, LLC
  */
 
-//========================================================================
-//
-// Modified under the Poppler project - http://poppler.freedesktop.org
-//
-// Poppler project changes to this file are under the GPLv2 or later license
-//
-// All changes made under the Poppler project to this file are licensed
-// under GPL version 2 or later
-//
-// Copyright (C) 2008, 2009 Albert Astals Cid <aacid at kde.org>
-//
-// To see a description of the changes please see the Changelog file that
-// came with your tarball or type make ChangeLog if you are building from git
-//
-//========================================================================
+/*========================================================================
+
+ Modified under the Poppler project - http://poppler.freedesktop.org
+
+ Poppler project changes to this file are under the GPLv2 or later license
+
+ All changes made under the Poppler project to this file are licensed
+ under GPL version 2 or later
+
+ Copyright (C) 2008, 2009 Albert Astals Cid <aacid at kde.org>
+
+ To see a description of the changes please see the Changelog file that
+ came with your tarball or type make ChangeLog if you are building from git
+
+========================================================================*/
 
 #include <stdio.h>
 #include <stddef.h>
diff --git a/utils/parseargs.h b/utils/parseargs.h
index 4418421..410dcc4 100644
--- a/utils/parseargs.h
+++ b/utils/parseargs.h
@@ -6,19 +6,19 @@
  * Copyright 1996-2003 Glyph & Cog, LLC
  */
 
-//========================================================================
-//
-// Modified under the Poppler project - http://poppler.freedesktop.org
-//
-// All changes made under the Poppler project to this file are licensed
-// under GPL version 2 or later
-//
-// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
-//
-// To see a description of the changes please see the Changelog file that
-// came with your tarball or type make ChangeLog if you are building from git
-//
-//========================================================================
+/*========================================================================
+
+ Modified under the Poppler project - http://poppler.freedesktop.org
+
+ All changes made under the Poppler project to this file are licensed
+ under GPL version 2 or later
+
+ Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+
+ To see a description of the changes please see the Changelog file that
+ came with your tarball or type make ChangeLog if you are building from git
+
+========================================================================*/
 
 #ifndef PARSEARGS_H
 #define PARSEARGS_H