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

List:       kde-commits
Subject:    kdebase/kcontrol/kfontinst/kfontinst
From:       Craig Drummond <craig () kde ! org>
Date:       2005-02-19 23:35:22
Message-ID: 20050219233522.645391BBB3 () office ! kde ! org
[Download RAW message or body]

CVS commit by craig: 

Fix for incorrect prototype on Solaris 2.6
CCBUGS:99336


  M +1 -3      GetPid.c   1.2
  M +5 -1      XConfig.cpp   1.23


--- kdebase/kcontrol/kfontinst/kfontinst/XConfig.cpp  #1.22:1.23
@@ -38,5 +38,9 @@
 #include <signal.h>
 
+#if defined OS_Irix || defined OS_Solaris
+extern "C" unsigned int kfi_getPid(const char *proc, pid_t ppid);
+#else
 extern "C" unsigned int kfi_getPid(const char *proc, unsigned int ppid);
+#endif 
 
 #define UNSCALED ":unscaled"

--- kdebase/kcontrol/kfontinst/kfontinst/GetPid.c  #1.1:1.2
@@ -83,6 +83,4 @@
 */
 
-unsigned int kfi_getPid(const char *proc, unsigned int ppid);
-
 #if defined OS_Linux || defined __Linux__
 


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