subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arfre...@apache.org
Subject svn commit: r1131479 - in /subversion/trunk: configure.ac subversion/libsvn_subr/magic.c
Date Sat, 04 Jun 2011 19:45:22 GMT
Author: arfrever
Date: Sat Jun  4 19:45:22 2011
New Revision: 1131479

URL: http://svn.apache.org/viewvc?rev=1131479&view=rev
Log:
Rename HAVE_LIBMAGIC to SVN_HAVE_LIBMAGIC for consistency with other SVN_HAVE_*
definitions.

* configure.ac: Define SVN_HAVE_LIBMAGIC instead of HAVE_LIBMAGIC.

* subversion/libsvn_subr/magic.c: Check SVN_HAVE_LIBMAGIC instead of
   HAVE_LIBMAGIC.

Modified:
    subversion/trunk/configure.ac
    subversion/trunk/subversion/libsvn_subr/magic.c

Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1131479&r1=1131478&r2=1131479&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Sat Jun  4 19:45:22 2011
@@ -721,7 +721,7 @@ AC_ARG_WITH(libmagic,AS_HELP_STRING([--w
 ])
 
 if test "$libmagic_found" != "no"; then
-  AC_DEFINE([HAVE_LIBMAGIC], [1], [Defined if libmagic support is enabled])
+  AC_DEFINE([SVN_HAVE_LIBMAGIC], [1], [Defined if libmagic support is enabled])
   SVN_MAGIC_LIBS="-lmagic"
 fi
 

Modified: subversion/trunk/subversion/libsvn_subr/magic.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/magic.c?rev=1131479&r1=1131478&r2=1131479&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/magic.c (original)
+++ subversion/trunk/subversion/libsvn_subr/magic.c Sat Jun  4 19:45:22 2011
@@ -38,18 +38,18 @@
 
 #include "private/svn_magic.h"
 
-#ifdef HAVE_LIBMAGIC
+#ifdef SVN_HAVE_LIBMAGIC
 #include <magic.h>
 #endif
 
 struct svn_magic__cookie_t {
-#ifdef HAVE_LIBMAGIC
+#ifdef SVN_HAVE_LIBMAGIC
   magic_t magic;
 #endif
   char dummy;
 };
 
-#ifdef HAVE_LIBMAGIC
+#ifdef SVN_HAVE_LIBMAGIC
 /* Close the magic database. */
 static apr_status_t
 close_magic_cookie(void *baton)
@@ -67,7 +67,7 @@ svn_magic__init(svn_magic__cookie_t **ma
 
   svn_magic__cookie_t *mc = NULL;
 
-#ifdef HAVE_LIBMAGIC
+#ifdef SVN_HAVE_LIBMAGIC
   mc = apr_palloc(result_pool, sizeof(*mc));
 
   /* Initialise libmagic. */
@@ -106,7 +106,7 @@ svn_magic__detect_binary_mimetype(const 
                                   apr_pool_t *scratch_pool)
 {
   const char *magic_mimetype = NULL;
-#ifdef HAVE_LIBMAGIC
+#ifdef SVN_HAVE_LIBMAGIC
   apr_finfo_t finfo;
 
   /* Do not ask libmagic for the mime-types of empty files.



Mime
View raw message