42b61e1a01
Someone in the OpenSSH world doesn't understand the difference between application and implementation namespaces. This causes conflicts with <readpassphrase.h>. PR: 34362 Submitted by: wollman@hergotha.lcs.mit.edu
23 lines
534 B
C
23 lines
534 B
C
--- openbsd-compat/readpassphrase.h.orig Sun Jan 27 19:18:10 2002
|
|
+++ openbsd-compat/readpassphrase.h Sun Jan 27 19:18:54 2002
|
|
@@ -28,6 +28,6 @@
|
|
*/
|
|
|
|
-#ifndef _READPASSPHRASE_H_
|
|
-#define _READPASSPHRASE_H_
|
|
+#ifndef READPASSPHRASE_H_
|
|
+#define READPASSPHRASE_H_
|
|
|
|
#include "includes.h"
|
|
@@ -43,6 +43,7 @@
|
|
|
|
char *readpassphrase(const char *, char *, size_t, int);
|
|
-
|
|
+#else /* HAVE_READPASSPHRASE */
|
|
+#include <readpassphrase.h>
|
|
#endif /* HAVE_READPASSPHRASE */
|
|
|
|
-#endif /* !_READPASSPHRASE_H_ */
|
|
+#endif /* !READPASSPHRASE_H_ */
|
|
|
|
|