RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 07-May-2016 17:15:23
Branch: rpm-5_4 Handle: 2016050715152300
Modified files: (Branch: rpm-5_4)
rpm system.h
Log:
- fix: rework uuid_t typedef avoidance on OS X.
Summary:
Revision Changes Path
2.129.2.18 +36 -37 rpm/system.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/system.h
============================================================================
$ cvs diff -u -r2.129.2.17 -r2.129.2.18 system.h
--- rpm/system.h 15 Apr 2016 18:54:12 -0000 2.129.2.17
+++ rpm/system.h 7 May 2016 15:15:23 -0000 2.129.2.18
@@ -9,8 +9,44 @@
#include "config.h"
#endif
+#define uuid_t __darwin_uuid_t
+#define uuid_create __vendor_uuid_create
+#define uuid_compare __vendor_uuid_compare
+
#include <sys/types.h>
+/* <unistd.h> should be included before any preprocessor test
+ of _POSIX_VERSION. */
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#if defined(__LCLINT__)
+/*@-superuser -declundef -incondefs @*/ /* LCL: modifies clause missing
*/
+extern int chroot (const char *__path)
+ /*@globals errno, systemState @*/
+ /*@modifies errno, systemState @*/;
+/*@=superuser =declundef =incondefs @*/
+#endif
+#if !defined(__GLIBC__) && !defined(__LCLINT__)
+#ifdef __APPLE__
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+#else
+extern char ** environ;
+#endif /* __APPLE__ */
+#endif
+#endif
+
+#if defined(HAVE_PWD_H)
+#include <pwd.h>
+#endif
+#if defined(HAVE_GRP_H)
+#include <grp.h>
+#endif
+
+#undef uuid_t
+#undef uuid_create
+#undef uuid_compare
+
#if defined(HAVE_SYS_BYTEORDER_H) && !defined(BYTE_ORDER)
/* construct Linux & BSD-compatible defines for Solaris and other
* SVR4 systems that have sys/byteorder.h
@@ -80,29 +116,6 @@
#define MAXPHYS (128 * 1024) /* max raw I/O transfer size */
#endif
-/* <unistd.h> should be included before any preprocessor test
- of _POSIX_VERSION. */
-#ifdef HAVE_UNISTD_H
-#define uuid_t unistd_uuid_t /* XXX Mac OS X dares to be different.
*/
-#include <unistd.h>
-#undef unistd_uuid_t /* XXX Mac OS X dares to be different.
*/
-#if defined(__LCLINT__)
-/*@-superuser -declundef -incondefs @*/ /* LCL: modifies clause missing
*/
-extern int chroot (const char *__path)
- /*@globals errno, systemState @*/
- /*@modifies errno, systemState @*/;
-/*@=superuser =declundef =incondefs @*/
-#endif
-#if !defined(__GLIBC__) && !defined(__LCLINT__)
-#ifdef __APPLE__
-#include <crt_externs.h>
-#define environ (*_NSGetEnviron())
-#else
-extern char ** environ;
-#endif /* __APPLE__ */
-#endif
-#endif
-
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
@@ -336,16 +349,6 @@
/*@=noparams@*/
#endif
-#if defined(HAVE_GRP_H)
-#define uuid_t unistd_uuid_t /* XXX Mac OS X dares to be different.
*/
-#define uuid_create unistd_uuid_create
-#define uuid_compare unistd_uuid_compare
-#include <grp.h>
-#undef unistd_uuid_t /* XXX Mac OS X dares to be different.
*/
-#undef unistd_uuid_create
-#undef unistd_uuid_compare
-#endif
-
#if defined(HAVE_LIMITS_H)
#include <limits.h>
#endif
@@ -516,10 +519,6 @@
#include <arpa/inet.h>
#endif
-#if defined(HAVE_PWD_H)
-#include <pwd.h>
-#endif
-
/* Take care of NLS matters. */
#if defined(HAVE_LOCALE_H)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
