$OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.5 2011/12/22 17:10:04 ajacoutot Exp $

Needs newlocale(3).

--- provider/libserver/ECDatabaseUtils.cpp.orig	Thu Dec 22 01:02:37 2011
+++ provider/libserver/ECDatabaseUtils.cpp	Thu Dec 22 12:16:30 2011
@@ -619,7 +619,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap 
 	std::string	strData;
 	unsigned int type = atoi(lpRow[FIELD_NR_TYPE]);
 	unsigned int ulPropTag;
+#ifndef __OpenBSD__
 	locale_t loc = createlocale(LC_NUMERIC, "C");
+#endif
 
 	if((type & MVI_FLAG) == MVI_FLAG) {
 		// Treat MVI as normal property
@@ -651,7 +653,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap 
 			goto exit;
 		}
 		lpPropVal->__union = SOAP_UNION_propValData_flt;
+#ifndef __OpenBSD__
 		lpPropVal->Value.flt = (float)strtod_l(lpRow[FIELD_NR_DOUBLE], NULL, loc);
+#else
+		lpPropVal->Value.flt = (float)strtod(lpRow[FIELD_NR_DOUBLE], NULL);
+#endif
 		break;
 	case PT_BOOLEAN:
 		if(lpRow[FIELD_NR_ULONG] == NULL) {
@@ -667,7 +673,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap 
 			goto exit;
 		}
 		lpPropVal->__union = SOAP_UNION_propValData_dbl;
+#ifndef __OpenBSD__
 		lpPropVal->Value.dbl = strtod_l(lpRow[FIELD_NR_DOUBLE], NULL, loc);
+#else
+		lpPropVal->Value.dbl = strtod(lpRow[FIELD_NR_DOUBLE], NULL);
+#endif
 		break;
 	case PT_CURRENCY:
 		if(lpRow[FIELD_NR_HI] == NULL || lpRow[FIELD_NR_LO] == NULL) {
@@ -685,7 +695,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap 
 			goto exit;
 		}
 		lpPropVal->__union = SOAP_UNION_propValData_dbl;
+#ifndef __OpenBSD__
 		lpPropVal->Value.dbl = strtod_l(lpRow[FIELD_NR_DOUBLE], NULL, loc);
+#else
+		lpPropVal->Value.dbl = strtod(lpRow[FIELD_NR_DOUBLE], NULL);
+#endif
 		break;
 	case PT_SYSTIME:
 		if(lpRow[FIELD_NR_HI] == NULL || lpRow[FIELD_NR_LO] == NULL) {
@@ -784,7 +798,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap 
 		for(i=0; i < lpPropVal->Value.mvflt.__size; i++)
 		{
 			ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
+#ifndef __OpenBSD__
 			lpPropVal->Value.mvflt.__ptr[i] = (float)strtod_l(strData.c_str(), NULL, loc);
+#else
+			lpPropVal->Value.mvflt.__ptr[i] = (float)strtod(strData.c_str(), NULL);
+#endif
 		}
 		break;
 	case PT_MV_DOUBLE:
@@ -801,7 +819,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap 
 		for(i=0; i < lpPropVal->Value.mvdbl.__size; i++)
 		{
 			ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
+#ifndef __OpenBSD__
 			lpPropVal->Value.mvdbl.__ptr[i] = strtod_l(strData.c_str(), NULL, loc);
+#else
+			lpPropVal->Value.mvdbl.__ptr[i] = strtod(strData.c_str(), NULL);
+#endif
 		}
 		break;
 	case PT_MV_CURRENCY:
@@ -888,7 +910,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap 
 	lpPropVal->ulPropTag = ulPropTag;
 
 exit:
+#ifndef __OpenBSD__
 	freelocale(loc);
+#endif
 	return er;
 }
 
