- rename cal.h to cal_boinc.h to avoid name conflict

svn path=/trunk/boinc/; revision=22039
MrBrain295 · Jul 22, 2010 · fac7537 · fac7537
1 parent db1367b
commit fac7537
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/checkin_notes b/checkin_notes
@@ -5460,3 +5460,6 @@ David  22 Jul 2010
         net_stats.cpp
         cs_notice.cpp
         acct_mgr.cpp
+
+David  22 Jul 2010
+    - rename cal.h to cal_boinc.h to avoid name conflict
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -94,7 +94,7 @@ pkginclude_HEADERS = \
     base64.h \
     boinc_fcgi.h \
     boinc_win.h \
-    cal.h \
+    cal_boinc.h \
     cert_sig.h \
     common_defs.h \
     coproc.h \

diff --git a/lib/cal.h → lib/cal_boinc.h b/lib/cal.h → lib/cal_boinc.h
diff --git a/lib/coproc.h b/lib/coproc.h
@@ -71,7 +71,7 @@
 #endif
 
 #include "miofile.h"
-#include "cal.h"
+#include "cal_boinc.h"
 
 #define MAX_COPROC_INSTANCES 64