summaryrefslogtreecommitdiff
authorsandman <sandman>2002-08-01 14:05:32 (UTC)
committer sandman <sandman>2002-08-01 14:05:32 (UTC)
commit66c4051568427ae3ffd5d8707e1cc91ce8ffbe62 (patch) (unidiff)
treeefeb6b333374349c4e08fbd8c3c16acc727f394b
parent32b7fdb0e9e5ec6cb6f791962efe68c40564b178 (diff)
downloadopie-66c4051568427ae3ffd5d8707e1cc91ce8ffbe62.zip
opie-66c4051568427ae3ffd5d8707e1cc91ce8ffbe62.tar.gz
opie-66c4051568427ae3ffd5d8707e1cc91ce8ffbe62.tar.bz2
Revert the non-gcc3-fix part of the gcc3-fix from Harlekin
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/opie-login/loginwindowimpl.cpp1
-rw-r--r--core/opie-login/opie-login.pro4
2 files changed, 2 insertions, 3 deletions
diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp
index 26d9225..3265b46 100644
--- a/core/opie-login/loginwindowimpl.cpp
+++ b/core/opie-login/loginwindowimpl.cpp
@@ -18,13 +18,12 @@
18 18
19#include <pwd.h> 19#include <pwd.h>
20#include <grp.h> 20#include <grp.h>
21#include <unistd.h> 21#include <unistd.h>
22#include <stdlib.h> 22#include <stdlib.h>
23 23
24#undef USEPAM // FOR my toolchain
25#ifdef USEPAM 24#ifdef USEPAM
26extern "C" { 25extern "C" {
27#include <security/pam_appl.h> 26#include <security/pam_appl.h>
28} 27}
29#else 28#else
30#include <crypt.h> 29#include <crypt.h>
diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro
index ef449ab..35c1ed0 100644
--- a/core/opie-login/opie-login.pro
+++ b/core/opie-login/opie-login.pro
@@ -14,12 +14,12 @@ INTERFACES = loginwindow.ui
14 14
15INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate 15INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
16DEPENDPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate 16DEPENDPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
17 17
18LIBS += -lqpe -lopie 18LIBS += -lqpe -lopie
19 19
20#usepam:LIBS += -lpam 20usepam:LIBS += -lpam
21#usepam:DEFINES += USEPAM 21usepam:DEFINES += USEPAM
22 22
23DESTDIR = $(OPIEDIR)/bin 23DESTDIR = $(OPIEDIR)/bin
24TARGET = opie-login 24TARGET = opie-login
25 25