Changeset 367 for trunk/libdjvu


Ignore:
Timestamp:
Apr 8, 2010, 10:16:54 AM (11 years ago)
Author:
dmik
Message:

Merged bramches/kmk (r294:365) to trunk.

Location:
trunk
Files:
1 deleted
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/libdjvu/DjVuGlobal.h

    r280 r367  
    7070inline void * operator new(size_t, void * ptr) { return ptr; }
    7171# endif
    72 #elif defined(AUTOCONF) && defined(HAVE_STDINCLUDES)
     72#elif (defined(AUTOCONF) || defined(OS2)) && defined(HAVE_STDINCLUDES)
    7373# include <new>
    7474#else
  • trunk/libdjvu/config.h

    r280 r367  
    131131
    132132/* define if the compiler comes with standard includes */
     133#if defined(__WATCOM__)
    133134#undef HAVE_STDINCLUDES
     135#else
     136#define HAVE_STDINCLUDES 1
     137#endif
    134138
    135139/* Define to 1 if you have the <stdint.h> header file. */
Note: See TracChangeset for help on using the changeset viewer.