diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2018-07-10 14:50:22 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2020-07-14 15:52:40 +0200 |
| commit | 1c88e1391a947e6989f30ab5fb4fd935a1c3e4af (patch) | |
| tree | 78ec93e13a8cdd6a3f496cdedf3c9c5eaf54ae8b | |
| parent | 73935283dea4c05c18e2ee2d3606e450d052c60c (diff) | |
Remove useless ifdefs
| -rw-r--r-- | greeter/Login.h | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/greeter/Login.h b/greeter/Login.h index b7c3660..73dae52 100644 --- a/greeter/Login.h +++ b/greeter/Login.h @@ -142,41 +142,12 @@ from The Open Group. /* notifyDone interface definition */ -# ifdef __OpenBSD__ -# include <sys/param.h> -# endif +# include <sys/param.h> # include <pwd.h> -# include <limits.h> -# ifdef USE_PAM -# define NAME_LEN PAM_MAX_RESP_SIZE -# define PASSWORD_LEN PAM_MAX_RESP_SIZE -# endif - -/* Defined to be in <limits.h> by SUSv2 */ -# if !defined(PASSWORD_LEN) && defined(PASS_MAX) -# define PASSWORD_LEN PASS_MAX -# endif - -/* _PW_NAME_LEN is found in <pwd.h> on OpenBSD > 2.8 (200012) */ -# if !defined(NAME_LEN) && defined(_PW_NAME_LEN) -# define NAME_LEN (_PW_NAME_LEN + 2) -# endif - -/* _PASSWORD_LEN appears to come from 4.4BSD-Lite <pwd.h> */ -# if !defined(PASSWORD_LEN) && defined(_PASSWORD_LEN) -# define PASSWORD_LEN (_PASSWORD_LEN + 2) -# endif - -/* Fallbacks if no other definition found */ -# ifndef NAME_LEN -# define NAME_LEN 32 -# endif - -# ifndef PASSWORD_LEN -# define PASSWORD_LEN 32 -# endif +# define PASSWORD_LEN _PASSWORD_LEN +# define NAME_LEN (_PW_NAME_LEN + 2) typedef struct _LoginData { char name[NAME_LEN], passwd[PASSWORD_LEN]; @@ -215,4 +186,3 @@ extern int SetValue(Widget ctx, int promptId, char *value); extern const char *GetValue(Widget ctx, int promptId); #endif /* _XtLogin_h */ -/* DON'T ADD STUFF AFTER THIS #endif */ |