1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-27 21:29:02 +00:00
freebsd-ports/audio/xcdplayer/files/patch-ab
David E. O'Brien 02d1b3a10b A quick purousal thru our port's patches directory shows a *WAY* over use of
__FreeBSD__.

That said, add __OpenBSD__ and __NetBSD__ where approapiate.
1997-02-16 21:11:14 +00:00

267 lines
6.7 KiB
Plaintext

*** button_setup.c Tue Jan 12 10:59:47 1993
--- /users/swallace/work/xcdplayer/button_setup.c Wed Feb 23 07:36:36 1994
***************
*** 20,25 ****
--- 20,28 ----
# include <X11/Xaw/Toggle.h>
# include "cdrom_globs.h"
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ # include "cdrom_freebsd.h"
+ #endif
#ifdef sun
# include "cdrom_sun.h"
#endif
***************
*** 44,49 ****
--- 47,69 ----
# include "ff.xbm"
# include "pgm.xbm"
+ void title_dialog_setup();
+ static void play_button_setup();
+ static void stop_button_setup();
+ static void pause_button_setup();
+ static void prev_button_setup();
+ static void next_button_setup();
+ static void eject_button_setup();
+ #ifdef sgi
+ void audio_button_setup();
+ #endif
+ static void quit_button_setup();
+ static void cycle_button_setup();
+ static void shuffle_button_setup();
+ static void rew_button_setup();
+ static void ff_button_setup();
+ static void pgm_button_setup();
+ void buttons_reset();
static Widget buttons_form_widget;
static Widget play_button_widget;
***************
*** 71,95 ****
Widget parent_widget;
{
Arg args[1];
-
- extern void title_dialog_setup();
- extern void play_button_setup();
- extern void stop_button_setup();
- extern void pause_button_setup();
- extern void prev_button_setup();
- extern void next_button_setup();
- extern void eject_button_setup();
- #ifdef sgi
- extern void audio_button_setup();
- #endif
- extern void quit_button_setup();
- extern void cycle_button_setup();
- extern void shuffle_button_setup();
- extern void rew_button_setup();
- extern void ff_button_setup();
- extern void pgm_button_setup();
- extern void buttons_reset();
-
buttons_form_widget = XtCreateManagedWidget("buttonsForm",
formWidgetClass,
--- 91,96 ----
*** cdrom_callb.c Tue Jan 12 10:59:48 1993
--- /users/swallace/work/xcdplayer/cdrom_callb.c Wed Feb 23 07:36:41 1994
***************
*** 22,27 ****
--- 22,30 ----
# include "debug.h"
# include "cdrom_globs.h"
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ # include "cdrom_freebsd.h"
+ #endif
#ifdef sun
# include "cdrom_sun.h"
#endif
*** internals.c Tue Jan 12 10:59:45 1993
--- /users/swallace/work/xcdplayer/internals.c Wed Feb 23 07:36:47 1994
***************
*** 22,27 ****
--- 22,30 ----
# include "debug.h"
# include "cdrom_globs.h"
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ # include "cdrom_freebsd.h"
+ #endif
#ifdef sun
# include "cdrom_sun.h"
#endif
***************
*** 29,35 ****
# include "cdrom_sgi.h"
#endif
!
static XtIntervalId ivid = -1;
static XtIntervalId scanivid = -1;
static XtIntervalId stativid = -1;
--- 32,38 ----
# include "cdrom_sgi.h"
#endif
! static void scan_update();
static XtIntervalId ivid = -1;
static XtIntervalId scanivid = -1;
static XtIntervalId stativid = -1;
***************
*** 170,176 ****
struct msf track_start;
struct msf start_addr, end_addr;
int curtrack;
- extern void scan_update();
if (cdrom_get_curmsf(&start_addr) == -1) {
debug_printf(1, "rew: error reading location\n");
--- 173,178 ----
***************
*** 304,310 ****
struct msf start_addr, end_addr, next_start;
char t;
int curtrack;
- extern void scan_update();
if (cdrom_get_curmsf(&start_addr) == -1) {
debug_printf(1, "ff: error reading location\n");
--- 306,311 ----
*** logo_setup.c Tue Jan 12 10:59:46 1993
--- /users/swallace/work/xcdplayer/logo_setup.c Wed Feb 23 07:36:52 1994
***************
*** 28,33 ****
--- 28,36 ----
# include <stdio.h>
# include "cdrom_globs.h"
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ # include "cdrom_freebsd.h"
+ #endif
#ifdef sun
# include "cdrom_sun.h"
#endif
***************
*** 55,73 ****
Widget title_done_widget;
static int vol;
void
logo_setup(parent_widget)
Widget parent_widget;
{
- extern void leds_label_setup();
- extern void cb_track_button();
- extern void cb_timer_button();
- extern void volume_jump_proc();
- extern void volume_scroll_proc();
- extern void popup_title_dialog();
- extern void popdown_title_dialog();
-
Widget version_label_widget;
char version_string[80];
--- 58,76 ----
Widget title_done_widget;
static int vol;
+ extern void leds_label_setup();
+ static void cb_track_button();
+ static void cb_timer_button();
+ static void volume_jump_proc();
+ static void volume_scroll_proc();
+ static void popup_title_dialog();
+ static void popdown_title_dialog();
+
void
logo_setup(parent_widget)
Widget parent_widget;
{
Widget version_label_widget;
char version_string[80];
*** program.c Tue Jan 12 10:59:49 1993
--- /users/swallace/work/xcdplayer/program.c Wed Feb 23 07:36:55 1994
***************
*** 27,36 ****
# include <stdio.h>
# include <string.h>
! # include <malloc.h>
# include "debug.h"
# include "cdrom_globs.h"
#ifdef sun
# include "cdrom_sun.h"
#endif
--- 27,39 ----
# include <stdio.h>
# include <string.h>
! # include <sys/malloc.h>
# include "debug.h"
# include "cdrom_globs.h"
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ # include "cdrom_freebsd.h"
+ #endif
#ifdef sun
# include "cdrom_sun.h"
#endif
***************
*** 52,57 ****
--- 55,69 ----
static Boolean adding_to_new_track = False;
static struct prognode *current_node = NULL;
+ static void cb_move_program_ptr();
+ static void cb_clear_program();
+ static void cb_cancel_program();
+ static void cb_save_program();
+ static void cb_trackbuttons();
+ static void cb_add_10();
+ static void cb_new_track();
+ static void cb_program_all();
+
void
program_form_setup (parent_widget)
Widget parent_widget;
***************
*** 66,80 ****
Widget cancel_button;
Widget save_button;
Widget all_button;
-
- extern void cb_move_program_ptr();
- extern void cb_clear_program();
- extern void cb_cancel_program();
- extern void cb_save_program();
- extern void cb_trackbuttons();
- extern void cb_add_10();
- extern void cb_new_track();
- extern void cb_program_all();
/*
* create program form as a non-managed widget, because this
--- 78,83 ----
*** shuffle.c Tue Jan 12 10:59:38 1993
--- /users/swallace/work/xcdplayer/shuffle.c Wed Feb 23 07:36:59 1994
***************
*** 18,23 ****
--- 18,26 ----
# include "debug.h"
# include "cdrom_globs.h"
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ # include "cdrom_freebsd.h"
+ #endif
#ifdef sun
# include "cdrom_sun.h"
#endif