Merge mac build fix

[disorder] / lib / dateparse.h

diff --git a/lib/dateparse.h b/lib/dateparse.h
index d86d14f001c2248f92ab78fed032adb790f25fb0..dc37a6a5c2dad34af0df9c9e4b4671ce2cb99c8c 100644 (file)
--- a/lib/dateparse.h
+++ b/lib/dateparse.h
@@ -2,33 +2,39 @@
  * This file is part of DisOrder
  * Copyright (C) 2008 Richard Kettlewell
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 /** @file lib/dateparse.h
  * @brief Date parsing
  */
 
+#ifndef DATEPARSE_H
+#define DATEPARSE_H
+
+#include <time.h>
+
 time_t dateparse(const char *s);
+#if 0
 struct tm *xgetdate(const char *string,
                    const char *const *template);
+#endif
 int xgetdate_r(const char *string,
               struct tm *tp,
               const char *const *template);
 
+#endif /* DATEPARSE_H */
+
 /*
 Local Variables:
 c-basic-offset:2