CVS commit: pkgsrc/fonts/fontconfig/files

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Aug 18 09:27:38 UTC 2020

Modified Files:
        pkgsrc/fonts/fontconfig/files: uuid.h

Log Message:
also need an implementation of uuid_compare() for the test suite


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/fontconfig/files/uuid.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/fonts/fontconfig/files/uuid.h
diff -u pkgsrc/fonts/fontconfig/files/uuid.h:1.1 pkgsrc/fonts/fontconfig/files/uuid.h:1.2
--- pkgsrc/fonts/fontconfig/files/uuid.h:1.1    Tue Aug 18 08:19:17 2020
+++ pkgsrc/fonts/fontconfig/files/uuid.h        Tue Aug 18 09:27:38 2020
@@ -228,4 +228,21 @@ static void uuid_generate_random(uuid_t 
        __uuid_generate_random(out, &num);
 }
 
+#define UUCMP(u1,u2) if (u1 != u2) return((u1 < u2) ? -1 : 1);
+
+static int uuid_compare(const uuid_t uu1, const uuid_t uu2)
+{
+       struct uuid     uuid1, uuid2;
+
+       uuid_unpack(uu1, &uuid1);
+       uuid_unpack(uu2, &uuid2);
+
+       UUCMP(uuid1.time_low, uuid2.time_low);
+       UUCMP(uuid1.time_mid, uuid2.time_mid);
+       UUCMP(uuid1.time_hi_and_version, uuid2.time_hi_and_version);
+       UUCMP(uuid1.clock_seq, uuid2.clock_seq);
+       return memcmp(uuid1.node, uuid2.node, 6);
+}
+
+
 #endif