[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Fri May 14 02:37:50 MDT 2010
The branch, master has been updated
via edecdab... s4:heimdal_build: move #undef __APPLE__ to the end of roken.h
from 0d51bab... Now we behave as Windows does, remove a Samba3 specific test return.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit edecdab58f49481a2f9ef0ca59ef1407adba8e05
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri May 14 10:35:46 2010 +0200
s4:heimdal_build: move #undef __APPLE__ to the end of roken.h
Some system includes need __APPLE__ defined.
metze
-----------------------------------------------------------------------
Summary of changes:
source4/heimdal_build/config.h | 5 -----
source4/heimdal_build/roken.h | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index 2cf36d3..35981b8 100644
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -28,9 +28,4 @@
#define LIBINTL
#endif
-/* we do not want any __APPLE__ magic */
-#ifdef __APPLE__
-#undef __APPLE__
-#endif
-
#endif
diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h
index 68d80f1..50da1da 100644
--- a/source4/heimdal_build/roken.h
+++ b/source4/heimdal_build/roken.h
@@ -170,4 +170,9 @@
extern const char *heimdal_version;
extern const char *heimdal_long_version;
+/* we do not want any __APPLE__ magic */
+#ifdef __APPLE__
+#undef __APPLE__
+#endif
+
#endif
--
Samba Shared Repository
More information about the samba-cvs
mailing list