[PyKDE] A (minor) patch for sip-xxx-snapshot-20030504

[Ulrich Berning]

Hi all,

the attached patch eleminates two minor problems:

The IBM C compiler fo AIX does not like C++ comments in C files. In 
siplib/siplib.c are some C++ comments.

Visual C++ on Windows can not find the include file 'unistd.h' (at least 
on my installation) . The include file is referenced in sipgen/lexer.c. 
The current sip snapshot has the following lines in lexer.c

#ifndef YY_ALWAYS_INTERACTIVE
#ifndef YY_NEVER_INTERACTIVE
#include<unistd.h>
#endif
#endif

where version 3.6 has has the following lines in lexer.c

#ifndef YY_ALWAYS_INTERACTIVE
#ifndef YY_NEVER_INTERACTIVE
extern int isatty YY_PROTO(( int ));
#endif
#endif


Ciao,
Ulli

-------------- next part --------------
diff -uNr sip-win-commercial-snapshot-20030504.orig/sipgen/lexer.c sip-win-commercial-snapshot-20030504/sipgen/lexer.c
--- sip-win-commercial-snapshot-20030504.orig/sipgen/lexer.c	Sun May  4 11:58:30 2003
+++ sip-win-commercial-snapshot-20030504/sipgen/lexer.c	Thu May 15 18:21:22 2003
@@ -2347,7 +2347,7 @@
 
 #ifndef YY_ALWAYS_INTERACTIVE
 #ifndef YY_NEVER_INTERACTIVE
-#include<unistd.h>
+extern int isatty YY_PROTO(( int ));
 #endif
 #endif
 
diff -uNr sip-win-commercial-snapshot-20030504.orig/siplib/siplib.c sip-win-commercial-snapshot-20030504/siplib/siplib.c
--- sip-win-commercial-snapshot-20030504.orig/siplib/siplib.c	Sun May  4 11:58:30 2003
+++ sip-win-commercial-snapshot-20030504/siplib/siplib.c	Thu May 15 18:21:22 2003
@@ -3023,8 +3023,9 @@
 }
 
 
-// The bsearch() helper function for searching a sorted string map table.
-
+/*
+ * The bsearch() helper function for searching a sorted string map table.
+ */
 static int compareStringMapEntry(const void *key,const void *el)
 {
 	return strcmp((const char *)key,((const sipStringTypeClassMap *)el) -> typeString);
@@ -3049,9 +3050,9 @@
         return ((me != NULL) ? *me -> pyClass : NULL);
 }
 
-
-// The bsearch() helper function for searching a sorted integer map table.
-
+/*
+ * The bsearch() helper function for searching a sorted integer map table.
+ */
 static int compareIntMapEntry(const void *key,const void *el)
 {
 	if ((int)key > ((const sipIntTypeClassMap *)el) -> typeInt)