[svn-commits] russell: branch 1.4 r91032 - in /branches/1.4: ./ include/asterisk/

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Dec  4 17:46:40 2007
New Revision: 91032

URL: http://svn.digium.com/view/asterisk?view=rev&rev=91032
Log:
Modify file.h to maintain API compatibility with earlier versions.  If a recent
compiler is being used, then a warning will show up for any modules still using
the old name "private" instead of "_private".
(patch suggested by paravoid)

Modified:
    branches/1.4/configure
    branches/1.4/configure.ac
    branches/1.4/include/asterisk/autoconfig.h.in
    branches/1.4/include/asterisk/compiler.h
    branches/1.4/include/asterisk/file.h

Modified: branches/1.4/configure
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure?view=diff&rev=91032&r1=91031&r2=91032
==============================================================================
--- branches/1.4/configure (original)
+++ branches/1.4/configure Tue Dec  4 17:46:40 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 78166 .
+# From configure.ac Revision: 82385 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -15293,6 +15293,58 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
+{ echo "$as_me:$LINENO: checking for compiler 'attribute deprecated' support" >&5
+echo $ECHO_N "checking for compiler 'attribute deprecated' support... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+static int __attribute__((deprecated)) test(void) {}
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ATTRIBUTE_deprecated 1
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
 { echo "$as_me:$LINENO: checking for -ffunction-sections support" >&5
 echo $ECHO_N "checking for -ffunction-sections support... $ECHO_C" >&6; }
 saved_CFLAGS="${CFLAGS}"

Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=91032&r1=91031&r2=91032
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Tue Dec  4 17:46:40 2007
@@ -316,6 +316,7 @@
 AST_GCC_ATTRIBUTE(const)
 AST_GCC_ATTRIBUTE(unused)
 AST_GCC_ATTRIBUTE(always_inline)
+AST_GCC_ATTRIBUTE(deprecated)
 
 AC_MSG_CHECKING(for -ffunction-sections support)
 saved_CFLAGS="${CFLAGS}"

Modified: branches/1.4/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/autoconfig.h.in?view=diff&rev=91032&r1=91031&r2=91032
==============================================================================
--- branches/1.4/include/asterisk/autoconfig.h.in (original)
+++ branches/1.4/include/asterisk/autoconfig.h.in Tue Dec  4 17:46:40 2007
@@ -46,6 +46,9 @@
 
 /* Define to 1 if your GCC C compiler supports the 'const' attribute. */
 #undef HAVE_ATTRIBUTE_const
+
+/* Define to 1 if your GCC C compiler supports the 'deprecated' attribute. */
+#undef HAVE_ATTRIBUTE_deprecated
 
 /* Define to 1 if your GCC C compiler supports the 'malloc' attribute. */
 #undef HAVE_ATTRIBUTE_malloc

Modified: branches/1.4/include/asterisk/compiler.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/compiler.h?view=diff&rev=91032&r1=91031&r2=91032
==============================================================================
--- branches/1.4/include/asterisk/compiler.h (original)
+++ branches/1.4/include/asterisk/compiler.h Tue Dec  4 17:46:40 2007
@@ -53,4 +53,10 @@
 #define attribute_malloc
 #endif
 
+#if HAVE_ATTRIBUTE_deprecated
+#define attribute_deprecated __attribute__((deprecated))
+#else
+#define attribute_deprecated
+#endif
+
 #endif /* _ASTERISK_COMPILER_H */

Modified: branches/1.4/include/asterisk/file.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/file.h?view=diff&rev=91032&r1=91031&r2=91032
==============================================================================
--- branches/1.4/include/asterisk/file.h (original)
+++ branches/1.4/include/asterisk/file.h Tue Dec  4 17:46:40 2007
@@ -132,7 +132,13 @@
 	FILE *f;
 	struct ast_frame fr;	/* frame produced by read, typically */
 	char *buf;		/* buffer pointed to by ast_frame; */
-	void *_private;	/* pointer to private buffer */
+	/* pointer to private buffer */
+	union {
+		void *_private;
+#if !defined(__cplusplus) && !defined(c_plusplus)
+		void *private attribute_deprecated;
+#endif
+	};
 	const char *orig_chan_name;
 };