X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=cde%2Fprograms%2Fdtpdmd%2Fdtpdmd.c;h=3d7ddd91991110c9cd3bb20dcef3831d0ce8e8ea;hb=c6b31ebd5fa74920034f8dbaf84ae27f66379ba0;hp=5489893c11de238feb0635ab6a08f9a002ed3cad;hpb=c884521619ded86baea5e0a74c8d0d2234c232fe;p=oweals%2Fcde.git

diff --git a/cde/programs/dtpdmd/dtpdmd.c b/cde/programs/dtpdmd/dtpdmd.c
index 5489893c..3d7ddd91 100644
--- a/cde/programs/dtpdmd/dtpdmd.c
+++ b/cde/programs/dtpdmd/dtpdmd.c
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -155,13 +155,13 @@ static void pusage( char *prog_name )
  *
  *****************************************************************************/
 
-static int generic_error_handler( edpy, eevent )
-    Display     *edpy;
-    XErrorEvent *eevent;
+static int generic_error_handler(Display *edpy, XErrorEvent *eevent)
 {
     g.xerrno  = eevent->error_code;
     g.xerrreq = eevent->request_code;
     g.xerrmin = eevent->minor_code;
+
+    return 0; /* XSetErrorHandler handlers return values are ignored */
 }
 
 /******************************************************************************
@@ -170,7 +170,7 @@ static int generic_error_handler( edpy, eevent )
  *
  *****************************************************************************/
 static void
-#if defined(__aix)
+#if defined(__aix) || defined(__linux__)
 handle_SIGCLD(int sigNum)
 #else
 handle_SIGCLD(void)
@@ -261,9 +261,8 @@ static void xtkick_proc( XtPointer w, int *source, XtInputId *id)
  *
  * main
  */
-main( argc, argv )
-    int argc;
-    char **argv;
+int
+main(int argc, char **argv)
 {
     int tscreen;
     XtInputId xtid;
@@ -383,7 +382,7 @@ main( argc, argv )
     sigemptyset(&svec.sa_mask);
     svec.sa_flags   = 0;
     svec.sa_handler = handle_SIGCLD;
-    (void) sigaction(SIGCLD, &svec, (struct sigaction *) NULL);
+    (void) sigaction(SIGCHLD, &svec, (struct sigaction *) NULL);
 
     /*
      * After this point, we need to trap all X and XIO errors.