pkgs/development/libraries/clucene-core/fix-darwin.patch

   1 --- a/src/shared/CLucene/LuceneThreads.h
   2 +++ b/src/shared/CLucene/LuceneThreads.h
   3 @@ -7,6 +7,9 @@
   4  #ifndef _LuceneThreads_h
   5  #define  _LuceneThreads_h
   6
   7 +#if defined(_CL_HAVE_PTHREAD)
   8 +       #include <pthread.h>
   9 +#endif
  10
  11  CL_NS_DEF(util)
  12  class CLuceneThreadIdCompare;
  13
  14 --- a/src/shared/CLucene/config/repl_tchar.h
  15 +++ b/src/shared/CLucene/config/repl_tchar.h
  16 @@ -28,26 +28,26 @@
  17          #define _istdigit iswdigit //* digit char check
  18          #define _totlower towlower //* convert char to lower case
  19          #define _totupper towupper //* convert char to lower case
  20 -        #define _tcslwr wcslwr //* convert string to lower case
  21 +        #define _tcslwr std::wcslwr //* convert string to lower case
  22
  23          //these are the string handling functions
  24          //we may need to create wide-character/multi-byte replacements for these
  25 -        #define _tcscpy wcscpy //copy a string to another string
  26 -        #define _tcsncpy wcsncpy //copy a specified amount of one string to another string.
  27 -        #define _tcscat wcscat //copy a string onto the end of the other string
  28 -               #define _tcsncat wcsncat
  29 -        #define _tcschr wcschr //find location of one character
  30 -        #define _tcsstr wcsstr //find location of a string
  31 -        #define _tcslen wcslen //get length of a string
  32 -        #define _tcscmp wcscmp //case sensitive compare two strings
  33 -        #define _tcsncmp wcsncmp //case sensitive compare two strings
  34 -        #define _tcscspn wcscspn //location of any of a set of character in a string
  35 +        #define _tcscpy std::wcscpy //copy a string to another string
  36 +        #define _tcsncpy std::wcsncpy //copy a specified amount of one string to another string.
  37 +        #define _tcscat std::wcscat //copy a string onto the end of the other string
  38 +               #define _tcsncat std::wcsncat
  39 +        #define _tcschr std::wcschr //find location of one character
  40 +        #define _tcsstr std::wcsstr //find location of a string
  41 +        #define _tcslen std::wcslen //get length of a string
  42 +        #define _tcscmp std::wcscmp //case sensitive compare two strings
  43 +        #define _tcsncmp std::wcsncmp //case sensitive compare two strings
  44 +        #define _tcscspn std::wcscspn //location of any of a set of character in a string
  45
  46                                 //string compare
  47          #ifdef _CL_HAVE_FUNCTION_WCSICMP
  48 -            #define _tcsicmp wcsicmp //* case insensitive compare two string
  49 +            #define _tcsicmp std::wcsicmp //* case insensitive compare two string
  50          #else
  51 -            #define _tcsicmp wcscasecmp //* case insensitive compare two string
  52 +            #define _tcsicmp std::wcscasecmp //* case insensitive compare two string
  53          #endif
  54                                 #if defined(_CL_HAVE_FUNCTION_WCSDUP)
  55                                 #define _tcsdup wcsdup
  56 @@ -56,8 +56,8 @@
  57                           #endif
  58
  59          //conversion functions
  60 -        #define _tcstod wcstod //convert a string to a double
  61 -        #define _tcstoi64 wcstoll //* convers a string to an 64bit bit integer
  62 +        #define _tcstod std::wcstod //convert a string to a double
  63 +        #define _tcstoi64 std::wcstoll //* convers a string to an 64bit bit integer
  64          #define _itot _i64tot
  65          #define _i64tot lltow //* converts a 64 bit integer to a string (with base)
  66      #else //if defined(_ASCII)
  67 @@ -105,7 +105,7 @@
  68      //some tchar headers miss these...
  69      #ifndef _tcstoi64
  70          #if defined(_UCS2)
  71 -               #define _tcstoi64 wcstoll //* convers a string to an 64bit bit integer
  72 +               #define _tcstoi64 std::wcstoll //* convers a string to an 64bit bit integer
  73          #else
  74                 #define _tcstoi64 strtoll
  75          #endif