From 53f293d36dbb6a7f11b39644a46cfd329878f22c Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sun, 9 Dec 2012 08:46:55 -0800 Subject: Imported Upstream version 1.7.3 --- ChangeLog | 15 ++++++++++++++- NEWS | 11 +++++++++-- configure | 24 ++++++++++++------------ configure.ac | 2 +- efreet.spec | 2 +- po/cs.gmo | Bin 453 -> 453 bytes po/cs.po | 4 ++-- po/de.gmo | Bin 461 -> 461 bytes po/de.po | 4 ++-- po/efreet.pot | 6 +++--- po/el.gmo | Bin 482 -> 482 bytes po/el.po | 4 ++-- po/es.gmo | Bin 457 -> 457 bytes po/es.po | 4 ++-- po/fr.gmo | Bin 453 -> 453 bytes po/fr.po | 4 ++-- po/it.gmo | Bin 456 -> 456 bytes po/it.po | 4 ++-- po/ja.gmo | Bin 465 -> 465 bytes po/ja.po | 4 ++-- po/ko.gmo | Bin 459 -> 459 bytes po/ko.po | 4 ++-- po/nl.gmo | Bin 457 -> 457 bytes po/nl.po | 4 ++-- po/pt.gmo | Bin 464 -> 464 bytes po/pt.po | 4 ++-- po/ru.gmo | Bin 470 -> 470 bytes po/ru.po | 4 ++-- po/sl.gmo | Bin 454 -> 454 bytes po/sl.po | 4 ++-- src/bin/efreet_icon_cache_create.c | 3 +++ src/lib/Makefile.am | 2 +- src/lib/Makefile.in | 2 +- src/lib/efreet.c | 18 +----------------- src/lib/efreet_alloca.h | 30 ++++++++++++++++++++++++++++++ src/lib/efreet_base.c | 18 +----------------- src/lib/efreet_desktop.c | 18 +----------------- src/lib/efreet_desktop_command.c | 18 +----------------- src/lib/efreet_icon.c | 18 +----------------- src/lib/efreet_ini.c | 18 +----------------- src/lib/efreet_menu.c | 18 +----------------- src/lib/efreet_mime.c | 17 +---------------- src/lib/efreet_utils.c | 20 ++------------------ 43 files changed, 109 insertions(+), 199 deletions(-) create mode 100644 src/lib/efreet_alloca.h diff --git a/ChangeLog b/ChangeLog index 71ab678..7e0d0f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -144,7 +144,20 @@ 1.7.1 release -2012-11-23 Luis Felipe Strano Moraes +2012-11-22 Sebastian Dransfeld + + * Accept unquoted values in user-dirs.dirs + +2012-11-23 Luis Felipe Strano Moraes 1.7.2 release +2012-11-24 Sebastian Dransfeld + + * Fix alloca + +2012-12-07 Luis Felipe Strano Moraes + + * 1.7.3 release + + diff --git a/NEWS b/NEWS index d2d2126..f6ffa8d 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,16 @@ -Efreet 1.7.2 +Efreet 1.7.3 + +Changes since Efreet 1.7.2: +--------------------------- + +Fixes: + - Fix alloca Changes since Efreet 1.7.1: --------------------------- -No changes, just updating to keep in sync with last release. +Fixes: + * Allow unquoted values in user-dirs.dirs Changes since Efreet 1.7.0: --------------------------- diff --git a/configure b/configure index 392d203..f077664 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for efreet 1.7.2. +# Generated by GNU Autoconf 2.68 for efreet 1.7.3. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='efreet' PACKAGE_TARNAME='efreet' -PACKAGE_VERSION='1.7.2' -PACKAGE_STRING='efreet 1.7.2' +PACKAGE_VERSION='1.7.3' +PACKAGE_STRING='efreet 1.7.3' PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net' PACKAGE_URL='' @@ -1370,7 +1370,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures efreet 1.7.2 to adapt to many kinds of systems. +\`configure' configures efreet 1.7.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1440,7 +1440,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of efreet 1.7.2:";; + short | recursive ) echo "Configuration of efreet 1.7.3:";; esac cat <<\_ACEOF @@ -1572,7 +1572,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -efreet configure 1.7.2 +efreet configure 1.7.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1995,7 +1995,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by efreet $as_me 1.7.2, which was +It was created by efreet $as_me 1.7.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2820,7 +2820,7 @@ fi # Define the identity of the package. PACKAGE='efreet' - VERSION='1.7.2' + VERSION='1.7.3' cat >>confdefs.h <<_ACEOF @@ -11791,7 +11791,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF -#define VMIC 2 +#define VMIC 3 _ACEOF @@ -11799,7 +11799,7 @@ cat >>confdefs.h <<_ACEOF #define VREV 0 _ACEOF -version_info="8:2:7" +version_info="8:3:7" release_info="" @@ -17272,7 +17272,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by efreet $as_me 1.7.2, which was +This file was extended by efreet $as_me 1.7.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17338,7 +17338,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -efreet config.status 1.7.2 +efreet config.status 1.7.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c05ebe3..3281734 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [1]) m4_define([v_min], [7]) -m4_define([v_mic], [2]) +m4_define([v_mic], [3]) m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) ##-- When released, remove the dnl on the below line diff --git a/efreet.spec b/efreet.spec index 001f021..3ec569f 100644 --- a/efreet.spec +++ b/efreet.spec @@ -4,7 +4,7 @@ Summary: FreeDesktop.Org Compatibility Library Name: efreet -Version: 1.7.2 +Version: 1.7.3 Release: %{_rel} License: BSD Group: System Environment/Libraries diff --git a/po/cs.gmo b/po/cs.gmo index d154a83..ebd8dcf 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index 292b59d..41934b8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-11-22 15:32-0800\n" +"POT-Creation-Date: 2012-12-07 11:47-0200\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" @@ -15,6 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/lib/efreet_base.c:128 +#: src/lib/efreet_base.c:112 msgid "Desktop" msgstr "Plocha" diff --git a/po/de.gmo b/po/de.gmo index 2a66452..210c604 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index d936ac4..1b3f5d5 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-11-22 15:32-0800\n" +"POT-Creation-Date: 2012-12-07 11:47-0200\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" @@ -15,6 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/lib/efreet_base.c:128 +#: src/lib/efreet_base.c:112 msgid "Desktop" msgstr "Arbeitsfläche" diff --git a/po/efreet.pot b/po/efreet.pot index 9259493..44c674e 100644 --- a/po/efreet.pot +++ b/po/efreet.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: efreet 1.7.2\n" +"Project-Id-Version: efreet 1.7.3\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-11-22 15:32-0800\n" +"POT-Creation-Date: 2012-12-07 11:47-0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/lib/efreet_base.c:128 +#: src/lib/efreet_base.c:112 msgid "Desktop" msgstr "" diff --git a/po/el.gmo b/po/el.gmo index ee3d829..d3e41b0 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index b52f0f9..65fa1e0 100644 --- a/po/el.po +++ b/po/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-11-22 15:32-0800\n" +"POT-Creation-Date: 2012-12-07 11:47-0200\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" @@ -15,6 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/lib/efreet_base.c:128 +#: src/lib/efreet_base.c:112 msgid "Desktop" msgstr "Επιφάνεια εργασίας" diff --git a/po/es.gmo b/po/es.gmo index 25ff355..7fe927d 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 91037ec..2995dcc 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-11-22 15:32-0800\n" +"POT-Creation-Date: 2012-12-07 11:47-0200\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" @@ -15,6 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/lib/efreet_base.c:128 +#: src/lib/efreet_base.c:112 msgid "Desktop" msgstr "Escritorio" diff --git a/po/fr.gmo b/po/fr.gmo index f30d92a..15be539 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index d511826..3de6466 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-11-22 15:32-0800\n" +"POT-Creation-Date: 2012-12-07 11:47-0200\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" @@ -15,6 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/lib/efreet_base.c:128 +#: src/lib/efreet_base.c:112 msgid "Desktop" msgstr "Bureau" diff --git a/po/it.gmo b/po/it.gmo index be77c5f..3d81966 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index 2bcdfdc..e01bb8d 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-11-22 15:32-0800\n" +"POT-Creation-Date: 2012-12-07 11:47-0200\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" @@ -15,6 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/lib/efreet_base.c:128 +#: src/lib/efreet_base.c:112 msgid "Desktop" msgstr "Scrivania" diff --git a/po/ja.gmo b/po/ja.gmo index 4da74e4..df43876 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index 1cac655..5271cd6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-11-22 15:32-0800\n" +"POT-Creation-Date: 2012-12-07 11:47-0200\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" @@ -15,6 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/lib/efreet_base.c:128 +#: src/lib/efreet_base.c:112 msgid "Desktop" msgstr "デスクトップ" diff --git a/po/ko.gmo b/po/ko.gmo index 60318cc..11e211c 100644 Binary files a/po/ko.gmo and b/po/ko.gmo differ diff --git a/po/ko.po b/po/ko.po index 934408d..519176d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-11-22 15:32-0800\n" +"POT-Creation-Date: 2012-12-07 11:47-0200\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" @@ -15,6 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/lib/efreet_base.c:128 +#: src/lib/efreet_base.c:112 msgid "Desktop" msgstr "바탕화면" diff --git a/po/nl.gmo b/po/nl.gmo index af24502..613963d 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index 2c7751a..5098c0b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-11-22 15:32-0800\n" +"POT-Creation-Date: 2012-12-07 11:47-0200\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" @@ -15,6 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/lib/efreet_base.c:128 +#: src/lib/efreet_base.c:112 msgid "Desktop" msgstr "Bureaublad" diff --git a/po/pt.gmo b/po/pt.gmo index c7734d5..7ed21df 100644 Binary files a/po/pt.gmo and b/po/pt.gmo differ diff --git a/po/pt.po b/po/pt.po index 45ce290..f298c47 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-11-22 15:32-0800\n" +"POT-Creation-Date: 2012-12-07 11:47-0200\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" @@ -15,6 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/lib/efreet_base.c:128 +#: src/lib/efreet_base.c:112 msgid "Desktop" msgstr "Área de Trabalho" diff --git a/po/ru.gmo b/po/ru.gmo index ca7de62..8483b5a 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index 6a77562..15aceb0 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-11-22 15:32-0800\n" +"POT-Creation-Date: 2012-12-07 11:47-0200\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" @@ -15,6 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/lib/efreet_base.c:128 +#: src/lib/efreet_base.c:112 msgid "Desktop" msgstr "Рабочий стол" diff --git a/po/sl.gmo b/po/sl.gmo index ade3b44..a1be1a5 100644 Binary files a/po/sl.gmo and b/po/sl.gmo differ diff --git a/po/sl.po b/po/sl.po index 41a4b96..4e8f7a0 100644 --- a/po/sl.po +++ b/po/sl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Efreet\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-11-22 15:32-0800\n" +"POT-Creation-Date: 2012-12-07 11:47-0200\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" @@ -15,6 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/lib/efreet_base.c:128 +#: src/lib/efreet_base.c:112 msgid "Desktop" msgstr "Namizje" diff --git a/src/bin/efreet_icon_cache_create.c b/src/bin/efreet_icon_cache_create.c index e8d100c..e2ec227 100644 --- a/src/bin/efreet_icon_cache_create.c +++ b/src/bin/efreet_icon_cache_create.c @@ -1,6 +1,9 @@ #ifdef HAVE_CONFIG_H # include #endif + +#include "efreet_alloca.h" + #include #include #include diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 824c8de..f1cc10b 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -66,4 +66,4 @@ libefreet_trash_la_CPPFLAGS = \ libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la libefreet_trash_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ -EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h +EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h efreet_alloca.h diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index c3c4cfd..aae2785 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -372,7 +372,7 @@ libefreet_trash_la_CPPFLAGS = \ libefreet_trash_la_LIBADD = @EFREET_LIBS@ libefreet.la libefreet_trash_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ -EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h +EXTRA_DIST = efreet_private.h efreet_xml.h efreet_cache_private.h efreet_alloca.h all: all-am .SUFFIXES: diff --git a/src/lib/efreet.c b/src/lib/efreet.c index c48223f..8d3bf57 100644 --- a/src/lib/efreet.c +++ b/src/lib/efreet.c @@ -2,23 +2,7 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif +#include "efreet_alloca.h" #include #include diff --git a/src/lib/efreet_alloca.h b/src/lib/efreet_alloca.h new file mode 100644 index 0000000..58a7398 --- /dev/null +++ b/src/lib/efreet_alloca.h @@ -0,0 +1,30 @@ +#ifndef EFREET_ALLOCA_H +#define EFREET_ALLOCA_H + +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_ALLOCA_H +# include +#elif !defined alloca +# ifdef __GNUC__ +# define alloca __builtin_alloca +# elif defined _AIX +# define alloca __alloca +# elif defined _MSC_VER +# include +# define alloca _alloca +# elif !defined HAVE_ALLOCA +# ifdef __cplusplus +extern "C" +# endif +void *alloca (size_t); +# endif +#endif + +#endif diff --git a/src/lib/efreet_base.c b/src/lib/efreet_base.c index 6ee0119..cf1bb9b 100644 --- a/src/lib/efreet_base.c +++ b/src/lib/efreet_base.c @@ -2,23 +2,7 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif +#include "efreet_alloca.h" #include #include diff --git a/src/lib/efreet_desktop.c b/src/lib/efreet_desktop.c index 9293f94..7faf43c 100644 --- a/src/lib/efreet_desktop.c +++ b/src/lib/efreet_desktop.c @@ -2,23 +2,7 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif +#include "efreet_alloca.h" #ifdef HAVE_EVIL # include diff --git a/src/lib/efreet_desktop_command.c b/src/lib/efreet_desktop_command.c index bf97f8f..f7f4d13 100644 --- a/src/lib/efreet_desktop_command.c +++ b/src/lib/efreet_desktop_command.c @@ -2,23 +2,7 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif +#include "efreet_alloca.h" #include #include diff --git a/src/lib/efreet_icon.c b/src/lib/efreet_icon.c index 526e0ec..86a669a 100644 --- a/src/lib/efreet_icon.c +++ b/src/lib/efreet_icon.c @@ -2,23 +2,7 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif +#include "efreet_alloca.h" #include #include diff --git a/src/lib/efreet_ini.c b/src/lib/efreet_ini.c index 375fda1..fbe4dd7 100644 --- a/src/lib/efreet_ini.c +++ b/src/lib/efreet_ini.c @@ -2,23 +2,7 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif +#include "efreet_alloca.h" #include #include diff --git a/src/lib/efreet_menu.c b/src/lib/efreet_menu.c index e612ba1..3ab6c5c 100644 --- a/src/lib/efreet_menu.c +++ b/src/lib/efreet_menu.c @@ -2,23 +2,7 @@ # include #endif -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif +#include "efreet_alloca.h" #include diff --git a/src/lib/efreet_mime.c b/src/lib/efreet_mime.c index 9343d90..51be95f 100644 --- a/src/lib/efreet_mime.c +++ b/src/lib/efreet_mime.c @@ -2,22 +2,7 @@ # include #endif -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif +#include "efreet_alloca.h" #include #include diff --git a/src/lib/efreet_utils.c b/src/lib/efreet_utils.c index dab85ef..a2bee37 100644 --- a/src/lib/efreet_utils.c +++ b/src/lib/efreet_utils.c @@ -2,25 +2,9 @@ # include #endif -/* TODO: add no_display check, as we might want only displayable items */ +#include "efreet_alloca.h" -#undef alloca -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif +/* TODO: add no_display check, as we might want only displayable items */ #include -- cgit v1.2.3