dtcm: Resolve CID 87713

[oweals/cde.git] / cde / programs / dtcm / server / reclotick.c

diff --git a/cde/programs/dtcm/server/reclotick.c b/cde/programs/dtcm/server/reclotick.c
index 62615df2c4dc605e7531800e4c0b27a77102862e..5109a5966be27c9809dcc82caa8573fb4add5a6d 100644 (file)
--- a/cde/programs/dtcm/server/reclotick.c
+++ b/cde/programs/dtcm/server/reclotick.c
@@ -1,3 +1,25 @@
+/*
+ * CDE - Common Desktop Environment
+ *
+ * Copyright (c) 1993-2012, The Open Group. All rights reserved.
+ *
+ * These libraries and programs are free software; you can
+ * redistribute them and/or modify them under the terms of the GNU
+ * Lesser General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * These libraries and programs are distributed in the hope that
+ * they will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with these librararies and programs; if not, write
+ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110-1301 USA
+ */
 /* $XConsortium: reclotick.c /main/6 1996/11/21 19:45:29 drk $ */
 /*
  *  (c) Copyright 1993, 1994 Hewlett-Packard Company
@@ -8,6 +30,9 @@
 
 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
+#if defined(linux)
+#undef SVR4
+#endif
 #include <X11/Xos_r.h>
 
 #include <stdlib.h>
@@ -327,7 +352,7 @@ DoWeek(
        if (_target_time) {
                if (!(unused = InitRepeatEventState(re)))
                        return (Tick)NULL;
-               start_time = DoWeek(NULL, _start_time, re, unused);
+               start_time = DoWeek(0, _start_time, re, unused);
                free(unused);
                if (_target_time < start_time)
                        target_time = start_time;
@@ -652,7 +677,7 @@ DoYearByMonth(
        if (_target_time) {
                if (!(unused = InitRepeatEventState(re)))
                        return (Tick)NULL;
-               start_time = DoYearByMonth(NULL, _start_time, re, unused);
+               start_time = DoYearByMonth(0, _start_time, re, unused);
                free(unused);
                if (_target_time < start_time)
                        target_time = start_time;
@@ -756,7 +781,7 @@ DoYearByDay(
        if (_target_time) {
                if (!(unused = InitRepeatEventState(re)))
                        return (Tick)NULL;
-               start_time = DoYearByDay(NULL, _start_time, re, unused);
+               start_time = DoYearByDay(0, _start_time, re, unused);
                free(unused);
                if (_target_time < start_time)
                        target_time = start_time;