claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove a couple of warnings, some of which were removed in the pbatard branch.

Browse Source
This commit is contained in:
R. Bernstein
2012-03-03 19:41:48 -05:00
parent 2145a5c805
commit e5ac559bcd
3 changed files with 109 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/driver/bincue.c.in
View File

@@ -1,5 +1,6 @@
/* -*- C -*- /* -*- C -*-
Copyright (C) 2004, 2006, 2008, 2010, 2011 Rocky Bernstein <rocky@gnu.org> Copyright (C) 2004, 2006, 2008, 2010, 2011, 2012
Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@@ -19,11 +20,9 @@
Regression test for BIN/CUE device driver: lib/driver/image/bincue.c. Regression test for BIN/CUE device driver: lib/driver/image/bincue.c.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" #include "config.h"
# define __CDIO_CONFIG_H__ 1 #define __CDIO_CONFIG_H__ 1
#endif #endif
#include <cdio/cdio.h>
#include <cdio/logging.h>
#ifdef HAVE_STDIO_H #ifdef HAVE_STDIO_H
#include <stdio.h> #include <stdio.h>
@@ -37,10 +36,14 @@
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
#endif #endif
#ifdef HAVE_UNISTD_H
#include <unistd.h> /* chdir */
#endif
#include <cdio/cdio.h>
#include <cdio/logging.h>
#include "helper.h" #include "helper.h"
#ifndef DATA_DIR #ifndef DATA_DIR
#define DATA_DIR "@abs_top_srcdir@/test/data" #define DATA_DIR "@abs_top_srcdir@/test/data"
#endif #endif

14
test/driver/cdrdao.c.in
View File

@@ -1,5 +1,6 @@
/* /*
Copyright (C) 2004, 2008, 2010, 2011 Rocky Bernstein <rocky@gnu.org> Copyright (C) 2004, 2008, 2010, 2011, 2012
Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@@ -19,11 +20,9 @@
Regression test for cdio_tocfile. Regression test for cdio_tocfile.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" #include "config.h"
# define __CDIO_CONFIG_H__ 1 #define __CDIO_CONFIG_H__ 1
#endif #endif
#include <cdio/cdio.h>
#include <cdio/logging.h>
#ifdef HAVE_STDIO_H #ifdef HAVE_STDIO_H
#include <stdio.h> #include <stdio.h>
@@ -37,7 +36,12 @@
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
#endif #endif
#ifdef HAVE_UNISTD_H
#include <unistd.h> /* chdir */
#endif
#include <cdio/cdio.h>
#include <cdio/logging.h>
#include "helper.h" #include "helper.h"
#ifndef DATA_DIR #ifndef DATA_DIR

22
test/driver/mmc_write.c
View File

@@ -20,12 +20,9 @@
Regression test for MMC commands involving read/write access. Regression test for MMC commands involving read/write access.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" #include "config.h"
# define __CDIO_CONFIG_H__ 1 #define __CDIO_CONFIG_H__ 1
#endif #endif
#include <cdio/cdio.h>
#include <cdio/logging.h>
#include <cdio/mmc_cmds.h>
#ifdef HAVE_STDIO_H #ifdef HAVE_STDIO_H
# include <stdio.h> # include <stdio.h>
@@ -36,14 +33,27 @@
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
# include <stdlib.h> # include <stdlib.h>
#endif #endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
# include <string.h> # include <string.h>
#endif #endif
#if !defined(HAVE_SLEEP) && defined(_WIN32) #if !defined(HAVE_SLEEP) && defined(_WIN32)
# include <windows.h> # include <windows.h>
# define sleep(s) Sleep(1000*s)
#endif #endif
#ifndef HAVE_USLEEP
# error usleep() unimplemented
# if !defined(HAVE_SLEEP) && defined(_WIN32)
# include <windows.h>
# define sleep(s) Sleep(1000*s)
# endif
#endif
#include <cdio/cdio.h>
#include <cdio/logging.h>
#include <cdio/mmc_cmds.h>
#define SKIP_TEST 77 #define SKIP_TEST 77
/* gcc may warn if no prototypes are given before function definition */ /* gcc may warn if no prototypes are given before function definition */