Changeset 1923 for trunk/src/emx

Timestamp:

Apr 26, 2005, 4:59:46 AM (21 years ago)

Author:

bird

Message:

Hide more symbols, undef potentially harmful libc aliasing.

Location:

trunk/src/emx/src/lib/misc

Files:

• sysctl.c (modified) (2 diffs, 1 prop)
• sysctl_mib.c (modified) (1 diff, 1 prop)

trunk/src/emx/src/lib/misc/sysctl.c

@@ -62 +62 @@
 #undef securelevel_gt
 #define securelevel_gt(cr, level) 0
+#undef sysctl
 
 /*
@@ -454 +455 @@
 
         SYSCTL_INIT();
-        extern int __sysctl_set__;
-        int *ptr = &__sysctl_set__;
+        extern int __libc_sysctl_set__;
+        int *ptr = &__libc_sysctl_set__;
         if (*ptr == -2)
             for (oidp = (struct sysctl_oid **)(ptr + 1); *oidp != NULL; oidp++)

trunk/src/emx/src/lib/misc/sysctl_mib.c

@@ -47 +47 @@
 #include <sys/sysctl.h>
 
-
-asm (".stabs  \"___sysctl_set__\", 21, 0, 0, 0xffffffff\n");
+#undef sysctl
+#undef kern
+#undef vm
+#undef hw
+#undef user
+#undef machdep
+#undef compat
+#undef security
+
+/* start the set. */
+asm (".stabs  \"___libc_sysctl_set__\", 21, 0, 0, 0xffffffff\n");
 
 SYSCTL_NODE(, 0,          sysctl, CTLFLAG_RW, 0,