[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeadmin/kuser
From:       Szombathelyi György <gyurco () freemail ! hu>
Date:       2004-07-29 18:32:24
Message-ID: 20040729183224.A74449A00 () office ! kde ! org
[Download RAW message or body]

CVS commit by gyurco: 

Added P_ prefix to some macros, so it will not clash with shadow.h in Solaris.


  M +8 -8      kuserfiles.cpp   1.11


--- kdeadmin/kuser/kuserfiles.cpp  #1.10:1.11
@@ -101,6 +101,6 @@ bool KUserFiles::loadpwd()
   int nispasswd_errno = 0;
   char processing_file = '\0';
-  #define PASSWD    0x01
-  #define NISPASSWD 0x02
+  #define P_PASSWD    0x01
+  #define P_NISPASSWD 0x02
   #define MAXFILES 2
 
@@ -120,5 +120,5 @@ bool KUserFiles::loadpwd()
 
   if(!passwd_filename.isEmpty()) {
-    processing_file = processing_file | PASSWD;
+    processing_file = processing_file | P_PASSWD;
     filename.append(passwd_filename);
   }
@@ -130,9 +130,9 @@ bool KUserFiles::loadpwd()
     if(rc != 0) {
       KMessageBox::error( 0, i18n("Stat call on file %1 failed: %2\nCheck KUser \
                settings.").arg(filename).arg(QString::fromLocal8Bit(strerror(errno))) \
                );
-      if( (processing_file & PASSWD) != 0 ) {
+      if( (processing_file & P_PASSWD) != 0 ) {
         passwd_errno = errno;
         if(!nispasswd_filename.isEmpty()) {
-          processing_file = processing_file & ~PASSWD;
-          processing_file = processing_file | NISPASSWD;
+          processing_file = processing_file & ~P_PASSWD;
+          processing_file = processing_file | P_NISPASSWD;
           filename.truncate(0);
           filename.append(nispasswd_filename);
@@ -197,6 +197,6 @@ bool KUserFiles::loadpwd()
 #endif
     if((!nispasswd_filename.isEmpty()) && (nispasswd_filename != passwd_filename)) {
-      processing_file = processing_file & ~PASSWD;
-      processing_file = processing_file | NISPASSWD;
+      processing_file = processing_file & ~P_PASSWD;
+      processing_file = processing_file | P_NISPASSWD;
       filename.truncate(0);
       filename.append(nispasswd_filename);


[prev in list] [next in list] [prev in thread] [next in thread]