Changeset 104 in openpam

Timestamp:

Apr 6, 2002, 7:02:06 PM (19 years ago)

Author:

Dag-Erling Smørgrav

Message:

Fix bugs in portability code; libpam now builds on NetBSD 1.5.2.

Sponsored by: DARPA, NAI Labs

File:

• trunk/include/security/openpam.h (modified) (3 diffs)

trunk/include/security/openpam.h

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/openpam.h#13 $
+ * $P4: //depot/projects/openpam/include/security/openpam.h#14 $
  */
 
@@ -118 +118 @@
  * Log to syslog
  */
-void _openpam_log(int _level,
+void
+_openpam_log(int _level,
         const char *_func,
         const char *_fmt,
         ...);
 
-#if defined(__STDC__) && (__STDC_VERSION__ > 199901L)
+#if defined(__STDC__) && (__STDC_VERSION__ >= 199901L)
 #define openpam_log(lvl, fmt, ...) \
         _openpam_log((lvl), __func__, fmt, __VA_ARGS__)
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && (__GNUC__ >= 2) && (__GNUC_MINOR__ >= 95)
+#define openpam_log(lvl, fmt, ...) \
+        _openpam_log((lvl), __func__, fmt, ##fmt)
+#elif defined(__GNUC__) && defined(__FUNCTION__)
 #define openpam_log(lvl, fmt...) \
-        _openpam_log((lvl), __func__, ##fmt)
+        _openpam_log((lvl), __FUNCTION__, ##fmt)
 #else
-extern openpam_log(int _level, const char *_format, ...);
+void
+openpam_log(int _level,
+        const char *_format,
+        ...);
 #endif
 
@@ -191 +198 @@
  * You are not expected to understand this.
  */
-#if defined(__GNUC__) && !defined(__PIC__)
 #if defined(__FreeBSD__)
 #define PAM_SOEXT ".so"
 #else
-#error Static linking is not supported on your platform
-#endif
+#ifndef NO_STATIC_MODULES
+#define NO_STATIC_MODULES
+#endif
+#endif
+#if defined(__GNUC__) && !defined(__PIC__) && !defined(NO_STATIC_MODULES)
 /* gcc, static linking */
 #include <sys/cdefs.h>