[Mplayer-cvslog] CVS: main/Gui/mplayer play.c,1.22,1.23 psignal.h,1.2,1.3 widgets.c,1.5,1.6

[Jürgen Keil]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv29233/mplayer

Modified Files:
	play.c psignal.h widgets.c 
Log Message:
Some changes to compile the GUI on solaris


Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- play.c	1 Sep 2001 19:57:44 -0000	1.22
+++ play.c	3 Sep 2001 16:13:12 -0000	1.23
@@ -97,9 +97,13 @@
 
 void mplMPlayerInit( int argc,char* argv[], char *envp[] )
 {
+ struct sigaction sa;
+
  mplShMem=calloc( 1,sizeof( mplCommStruct ) );
  mplShMem->Balance=50.0f;
- signal( SIGTYPE,mplMainSigHandler );
+ memset(&sa, 0, sizeof(sa));
+ sa.sa_handler = mplMainSigHandler;
+ sigaction( SIGTYPE,&sa,NULL );
 }
 
 float mplGetPosition( void )

Index: psignal.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/psignal.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- psignal.h	29 Aug 2001 13:44:12 -0000	1.2
+++ psignal.h	3 Sep 2001 16:13:12 -0000	1.3
@@ -39,7 +39,12 @@
 #define mplIncAudioBufferDelay                   28
 #define mplDecAudioBufferDelay                   29
 
+#ifdef	__SVR4
+#define	SIGTYPE SIGUSR2
+#warning should we use SIGUSR1 or SIGUSR2 on linux, bsd, ... too?
+#else
 #define SIGTYPE _NSIG - 1
+#endif
 
 extern int gtkIsOk;
 
@@ -57,4 +62,4 @@
 
 extern void mplErrorHandler( int critical,const char * format, ... );
 
-#endif
\ No newline at end of file
+#endif

Index: widgets.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- widgets.c	1 Sep 2001 18:39:46 -0000	1.5
+++ widgets.c	3 Sep 2001 16:13:12 -0000	1.6
@@ -63,6 +63,8 @@
 
 static void gtkThreadProc( int argc,char * argv[] )
 {
+ struct sigaction sa;
+
  gtk_set_locale();
  gtk_init( &argc,&argv );
  gdk_set_use_xshm( TRUE );
@@ -71,7 +73,9 @@
 
  gtkPID=getppid();
 
- signal( SIGTYPE,gtkSigHandler );
+ memset(&sa, 0, sizeof(sa));
+ sa.sa_handler = gtkSigHandler;
+ sigaction( SIGTYPE, &sa, NULL );
 
  gtkIsOk=True;
  gtkSendMessage( evGtkIsOk );