headers for gcc 4.4HEADmaster

Thanks to Kevin Turner for spotting and patching it.

2 files changed, 6 insertions, 4 deletions

diff --git a/lib/hypnodata.cc b/lib/hypnodata.cc
index a64b7d7..376c7ff 100644
--- a/lib/hypnodata.cc
+++ b/lib/hypnodata.cc
@@ -1,34 +1,35 @@
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <napkin/exception.h>
 #include <napkin/util.h>
 #include <napkin/types.h>
 
 namespace napkin {
 
     void hypnodata_t::clear() {
 	to_bed = alarm = 0;
 	data_a = window = 0;
 	almost_awakes.clear();
     }
 
     static time_t from_minute_w3c(const string& w3c) {
 	struct tm t; memset(&t,0,sizeof(t)); t.tm_isdst=-1;
 	if(sscanf(w3c.c_str(),"%04d-%02d-%02dT%02d:%02d",
 		&t.tm_year,&t.tm_mon,&t.tm_mday,&t.tm_hour,&t.tm_min)!=5)
 	    throw exception("failed to parse w3c time");
 	--t.tm_mon;t.tm_year-=1900;
 	time_t rv = mktime(&t);
 	if(rv==(time_t)-1)
 	    throw exception("failed to mktime()");
 	return rv;
     }
 
     void hypnodata_t::set_to_bed(const string& w3c) {
 	to_bed = from_minute_w3c(w3c); }
     void hypnodata_t::set_alarm(const string& w3c) {
 	alarm = from_minute_w3c(w3c); }
     void hypnodata_t::set_window(const string& str) {
 	window = strtol(str.c_str(),0,10); /* TODO: check for error */
     }
     void hypnodata_t::set_data_a(const string& str) {
diff --git a/lib/st-decode.cc b/lib/st-decode.cc
index b354250..81cbb8f 100644
--- a/lib/st-decode.cc
+++ b/lib/st-decode.cc
@@ -1,34 +1,35 @@
-#include <stdlib.h>
-#include <string.h>
+#include <stdint.h>
+#include <cstdlib>
+#include <cstring>
 #include <stdexcept>
 #include <numeric>
 #include <napkin/exception.h>
 #include <napkin/st/decode.h>
 
 namespace napkin {
     namespace sleeptracker {
 	using std::invalid_argument;
 	using std::runtime_error;
 
 	struct st_time_t {
 	    uint8_t hour;
 	    uint8_t min;
 	};
 	struct st_date_t {
 	    uint8_t month;
 	    uint8_t day;
 	    uint8_t dow;
 	};
 	struct st_fulltime_t {
 	    uint8_t hour;
 	    uint8_t min;
 	    uint8_t sec;
 	};
 	struct st_data_header_t {
 	    char magic;
 	    st_date_t today;
 	    uint8_t window;
 	    st_time_t to_bed;
 	    st_time_t alarm;
 	    uint8_t nawakes;
 	};