X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=strutil.c;h=e5278dfe3fda303156eb05b62bc95577f71b4158;hb=8c48f17944a224787aa430b3b3dc5f8709ccb700;hp=1c3d023f014cae475df73389afcb029dfdb2737f;hpb=dfcc0bf9d3b56c06daa1c4eec923ad21bf13dcd3;p=libsigrok.git

diff --git a/strutil.c b/strutil.c
index 1c3d023f..e5278dfe 100644
--- a/strutil.c
+++ b/strutil.c
@@ -41,11 +41,11 @@ char *sr_samplerate_string(uint64_t samplerate)
 	if (!o)
 		return NULL;
 
-	if (samplerate >= GHZ(1))
+	if (samplerate >= SR_GHZ(1))
 		r = snprintf(o, 30, "%" PRIu64 " GHz", samplerate / 1000000000);
-	else if (samplerate >= MHZ(1))
+	else if (samplerate >= SR_MHZ(1))
 		r = snprintf(o, 30, "%" PRIu64 " MHz", samplerate / 1000000);
-	else if (samplerate >= KHZ(1))
+	else if (samplerate >= SR_KHZ(1))
 		r = snprintf(o, 30, "%" PRIu64 " kHz", samplerate / 1000);
 	else
 		r = snprintf(o, 30, "%" PRIu64 " Hz", samplerate);
@@ -78,11 +78,11 @@ char *sr_period_string(uint64_t frequency)
 	if (!o)
 		return NULL;
 
-	if (frequency >= GHZ(1))
+	if (frequency >= SR_GHZ(1))
 		r = snprintf(o, 30, "%" PRIu64 " ns", frequency / 1000000000);
-	else if (frequency >= MHZ(1))
+	else if (frequency >= SR_MHZ(1))
 		r = snprintf(o, 30, "%" PRIu64 " us", frequency / 1000000);
-	else if (frequency >= KHZ(1))
+	else if (frequency >= SR_KHZ(1))
 		r = snprintf(o, 30, "%" PRIu64 " ms", frequency / 1000);
 	else
 		r = snprintf(o, 30, "%" PRIu64 " s", frequency);
@@ -198,15 +198,15 @@ uint64_t sr_parse_sizestring(const char *sizestring)
 			break;
 		case 'k':
 		case 'K':
-			multiplier = KHZ(1);
+			multiplier = SR_KHZ(1);
 			break;
 		case 'm':
 		case 'M':
-			multiplier = MHZ(1);
+			multiplier = SR_MHZ(1);
 			break;
 		case 'g':
 		case 'G':
-			multiplier = GHZ(1);
+			multiplier = SR_GHZ(1);
 			break;
 		default:
 			val = 0;