Changeset 1167 for 1.8.3/trunk/confmagic.h

Timestamp:

12/28/07 19:57:17 (8 months ago)

Author:

shawnw

Message:

Merge devel into trunk for p6 release

Files:

• 1.8.3/trunk/confmagic.h (modified) (2 diffs)

1.8.3/trunk/confmagic.h

@@ -13 +13 @@
-#define _confmagic_h_
-
-
+
+
+
- * (which isn't exportable from the U.S.), then don't encrypt
- */
@@ -55 +57 @@
-#endif
-
+#if defined(HAVE_POLLTS) && !defined(HAVE_PPOLL)
+/* Linux's ppoll() is identical to NetBSD's pollts() in all but name. */
+#define ppoll pollts
+#define HAVE_PPOLL
-#endif
+
+#endif