[Spread-cvs] commit: r492 - in libspreadutil/trunk: . include
jonathan at spread.org
jonathan at spread.org
Tue Mar 6 00:26:59 EST 2012
Author: jonathan
Date: 2012-03-06 00:26:59 -0500 (Tue, 06 Mar 2012)
New Revision: 492
Modified:
libspreadutil/trunk/Changelog
libspreadutil/trunk/include/spu_alarm_types.h
Log:
Fix CONF alarm type to not conflict with OpenSSL by changing to CONF_SYS
Modified: libspreadutil/trunk/Changelog
===================================================================
--- libspreadutil/trunk/Changelog 2012-03-06 05:26:18 UTC (rev 491)
+++ libspreadutil/trunk/Changelog 2012-03-06 05:26:59 UTC (rev 492)
@@ -1,3 +1,8 @@
+Mon Mar 5 23:50:52 2012 Jonathan Stanton <jonathan at spreadconcepts.com>
+
+ * include/spu_alarm_types.h (CONF_SYS): Change CONF alarm type which conflicted with OpenSSL
+ to CONF_SYS to avoid the conflict.
+
Mon Mar 5 18:14:22 2012 Jonathan Stanton <jonathan at spreadconcepts.com>
* src/memory.c (Mem_init_status): Remove Mem_init_status function as it is hacked in
Modified: libspreadutil/trunk/include/spu_alarm_types.h
===================================================================
--- libspreadutil/trunk/include/spu_alarm_types.h 2012-03-06 05:26:18 UTC (rev 491)
+++ libspreadutil/trunk/include/spu_alarm_types.h 2012-03-06 05:26:59 UTC (rev 492)
@@ -59,7 +59,7 @@
#define NETWORK 0x00000020
#define PROTOCOL 0x00000040
#define SESSION 0x00000080
-//#define CONF 0x00000100 Clash with an OpenSSL definition
+#define CONF_SYS 0x00000100
#define MEMB 0x00000200
#define FLOW_CONTROL 0x00000400
#define STATUS 0x00000800
More information about the Spread-cvs
mailing list