Subversion Repositories pub

Compare Revisions

Ignore whitespace Rev 725 → Rev 726

/nautilus-follow-symlink/trunk/caja/configure.ac
15,11 → 15,17
AC_CONFIG_MACRO_DIR([m4])
 
dnl default FLAGS, if none provided (note to self: ':=' is not portable)
if test -z "$CPPFLAGS" ; then
CPPFLAGS="-pedantic-errors"
fi
dnl if test -z "$CPPFLAGS" ; then
dnl # NOTE: -pedantic will error when it encounters #warning because it
dnl # it is a GCC extension, nautilus-extension uses #warning
dnl # CPPFLAGS="-pedantic-errors"
dnl fi
if test -z "$CFLAGS" ; then
CFLAGS="-Werror -Winline"
# NOTE: Getting warnings about granular inclusion of nautilus-extension
# headers and deprecated ones, coming from nautilus-extension, not my
# code
#CFLAGS="-Werror -Winline"
CFLAGS="-Winline"
fi
 
dnl Extra flags always set (might be overridden by user's)
30,6 → 36,10
CFLAGS="-I\"$PWD/src/caja-layer\" -O2 -Wall -std=gnu99 $CFLAGS"
# -z relro -> read-only relocation ld flag
LDFLAGS="-Wl,--as-needed -Wl,-z,relro $LDFLAGS"
# FIXME: Getting multiple definitions for basic functions like read and getcwd,
# not sure where they come from
# --allow-multiple-definition sounds like a bad idea, though
LDFLAGS="-Wl,--allow-multiple-definition $LDFLAGS"
 
# libtool, DISABLE_STATIC should go before PROG_LIBTOOL
AM_DISABLE_STATIC
/nautilus-follow-symlink/trunk/nautilus/configure.ac
7,7 → 7,6
AC_CANONICAL_SYSTEM
AC_CANONICAL_BUILD
AC_ARG_PROGRAM
 
AM_INIT_AUTOMAKE([1.7 foreign])
AC_REVISION(SVN $Rev$)
 
15,11 → 14,17
AC_CONFIG_MACRO_DIR([m4])
 
dnl default FLAGS, if none provided (note to self: ':=' is not portable)
if test -z "$CPPFLAGS" ; then
CPPFLAGS="-pedantic-errors"
fi
dnl if test -z "$CPPFLAGS" ; then
dnl # NOTE: -pedantic will error when it encounters #warning because it
dnl # it is a GCC extension, nautilus-extension uses #warning
dnl # CPPFLAGS="-pedantic-errors"
dnl fi
if test -z "$CFLAGS" ; then
CFLAGS="-Werror -Winline"
# NOTE: Getting warnings about granular inclusion of nautilus-extension
# headers and deprecated ones, coming from nautilus-extension, not my
# code
#CFLAGS="-Werror -Winline"
CFLAGS="-Winline"
fi
 
dnl Extra flags always set (might be overridden by user's)
30,6 → 35,10
CFLAGS="-O2 -Wall -std=gnu99 $CFLAGS"
# -z relro -> read-only relocation ld flag
LDFLAGS="-Wl,--as-needed -Wl,-z,relro $LDFLAGS"
# FIXME: Getting multiple definitions for basic functions like read and getcwd,
# not sure where they come from
# --allow-multiple-definition sounds like a bad idea, though
LDFLAGS="-Wl,--allow-multiple-definition $LDFLAGS"
 
# libtool, DISABLE_STATIC should go before PROG_LIBTOOL
AM_DISABLE_STATIC
/nautilus-follow-symlink/trunk/nautilus/src/follow-symlink.c
149,7 → 149,7
}
 
 
gboolean file_is_directory (const gpointer const file_data)
gboolean file_is_directory (const gpointer file_data)
{
TRACE();
 
/nautilus-follow-symlink/trunk/nautilus/src/follow-symlink.h
61,7 → 61,7
 
static NautilusMenuItem * fsl_menu_item_new(GdkScreen *, gboolean, const gchar *);
 
static inline __pure gboolean file_is_directory(const gpointer const);
static inline __pure gboolean file_is_directory(const gpointer);
 
static gsize printf_string_upper_bound(const gchar *, ...);