From 9a833ce6e6201c28fae7e6d8539acfd52eca91c8 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 19 Apr 2014 21:36:18 +0000
Subject: gcc2 build fix


diff --git a/configure.ac b/configure.ac
index b9b6c67..fe79b04 100755
--- a/configure.ac
+++ b/configure.ac
@@ -239,7 +239,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
 dnl empty_array_size
 AC_MSG_CHECKING([how to create empty arrays])
 
-empty_array_size="xxxx"
+empty_array_size="xxx"
 AC_TRY_COMPILE([],[struct { int foo; int bar[]; } doo;], empty_array_size="")
 
 if test "x$empty_array_size" = "xxxx"; then
@@ -621,6 +621,7 @@ if test "x$enable_cddb" != "xno"; then
     [AC_MSG_WARN([new enough libcddb not found. CDDB access disabled. Get libcddb from http://libcddb.sourceforge.net])
     HAVE_CDDB=no])
     AC_CHECK_LIB(socket, connect)
+    AC_CHECK_LIB(network, connect)
     AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
 fi
 
diff --git a/example/mmc1.c b/example/mmc1.c
index 29991e7..66b7a67 100644
--- a/example/mmc1.c
+++ b/example/mmc1.c
@@ -90,9 +90,9 @@ main(int argc, const char *argv[])
     {
 	driver_return_code_t i_status;
 	bool b_erasable;
+	cdio_mmc_feature_profile_t disctype;
 
 	i_status = mmc_get_disc_erasable(p_cdio, &b_erasable);
-	cdio_mmc_feature_profile_t disctype;
 	if (DRIVER_OP_SUCCESS == i_status)
 	    printf("-- Disc is %serasable.\n", b_erasable ? "" : "not ");
 	else
-- 
1.8.3.4


From 5a1f12b6d56011b170f1be896d9f13b38ae39755 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 12 Sep 2014 11:36:35 +0200
Subject: Fix tests for gcc2.


diff --git a/lib/driver/abs_path.c b/lib/driver/abs_path.c
index 6654ec7..fb198b1 100644
--- a/lib/driver/abs_path.c
+++ b/lib/driver/abs_path.c
@@ -108,10 +108,12 @@ cdio_dirname(const char *fname)
 char *
 cdio_abspath(const char *cwd, const char *fname)
 {
+	size_t len;
+	char* result;
     if (isdirsep(*fname)) return strdup(fname);
 
-    size_t len   = strlen(cwd) + strlen(fname) + 2;
-    char* result = calloc(sizeof(char), len);
+    len   = strlen(cwd) + strlen(fname) + 2;
+    result = calloc(sizeof(char), len);
     snprintf(result, len, "%s%c%s", 
 	     cwd, CDIO_FILE_SEPARATOR, fname);
     return result;
diff --git a/src/getopt.c b/src/getopt.c
index 80c7cb2..d728d43 100755
--- a/src/getopt.c
+++ b/src/getopt.c
@@ -398,6 +398,13 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		    int long_only, struct _getopt_data *d, int posixly_correct)
 {
   int print_errors = d->opterr;
+	char *nameend;
+	const struct option *p;
+	const struct option *pfound = NULL;
+	int exact = 0;
+	int ambig = 0;
+	int indfound = 0;
+	int option_index;
 
   if (argc < 1)
     return -1;
@@ -877,14 +884,6 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 	if (longopts == NULL)
 	  goto no_longs;
 
-	char *nameend;
-	const struct option *p;
-	const struct option *pfound = NULL;
-	int exact = 0;
-	int ambig = 0;
-	int indfound = 0;
-	int option_index;
-
 	/* This is an option that requires an argument.  */
 	if (*d->__nextchar != '\0')
 	  {
diff --git a/test/driver/bincue.c b/test/driver/bincue.c
index de64dce..7ed1ee8 100644
--- a/test/driver/bincue.c
+++ b/test/driver/bincue.c
@@ -45,7 +45,7 @@
 #include "helper.h"
 
 #ifndef DATA_DIR
-#define DATA_DIR "/src/external-vcs/savannah/libcdio/test/data"
+#define DATA_DIR "/sources/libcdio-0.92/test/data"
 #endif
 
 #define NUM_GOOD_CUES 2
@@ -117,9 +117,9 @@ main(int argc, const char *argv[])
     if (!p_cdio) {
       printf("Can't open cdda.cue\n");
     } else {
+      char *psz_device;
       /* Just test performing some operations. */
       cdio_set_blocksize(p_cdio, 2048);
-      char *psz_device;
 
 #ifdef HAVE_CHDIR
       if (0 == chdir(DATA_DIR))
-- 
1.8.3.4

