From 7f8f0f806af7800652d352e6428be7d3fdd1a176 Mon Sep 17 00:00:00 2001 From: "R. Bernstein" Date: Mon, 15 Jun 2009 09:31:54 -0400 Subject: [PATCH] Savannah bug #26808 - Multiple definitions of cddb_opts. Helps MinGW/MSys compilation. Patch courtesy of lrn. --- src/cddb.c | 4 +++- src/cddb.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/cddb.c b/src/cddb.c index 8e45f073..cd111891 100644 --- a/src/cddb.c +++ b/src/cddb.c @@ -1,7 +1,7 @@ /* $Id: cddb.c,v 1.8 2008/06/25 08:01:54 rocky Exp $ - Copyright (C) 2005, 2008 Rocky Bernstein + Copyright (C) 2005, 2008, 2009 Rocky Bernstein This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,6 +25,8 @@ #include #include "cddb.h" +cddb_opts_t cddb_opts; + /*! Returns the sum of the decimal digits in a number. Eg. 1955 = 20 */ diff --git a/src/cddb.h b/src/cddb.h index c9aaae82..880f0453 100644 --- a/src/cddb.h +++ b/src/cddb.h @@ -1,7 +1,7 @@ /* $Id: cddb.h,v 1.6 2008/06/25 08:01:54 rocky Exp $ - Copyright (C) 2005, 2007, 2008 Rocky Bernstein + Copyright (C) 2005, 2007, 2008, 2009 Rocky Bernstein This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ typedef struct cddb_opts_s char *cachedir; } cddb_opts_t; -cddb_opts_t cddb_opts; +extern cddb_opts_t cddb_opts; /*! Compute the CDDB disk ID for an Audio disk. This is a funny checksum