Ignore:
Timestamp:
Mar 6, 2008, 3:18:30 PM (12 years ago)
Author:
Sam Hocevar
Message:
  • Get rid of WATCOMC tests.
Location:
abuse/trunk/src/imlib
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/imlib/filesel.cpp

    r56 r90  
    99
    1010#include "config.h"
    11 
    12 #ifdef __WATCOMC__
    13 #   include <direct.h>
    14 #endif
    1511
    1612#include "filesel.hpp"
  • abuse/trunk/src/imlib/jmalloc.cpp

    r58 r90  
    680680      case HI_BLOCK :
    681681      { free(bmanage[i].addr); } break;
    682 #ifdef __WATCOMC__     
    683       case LOW_BLOCK :
    684       { free_low_memory(bmanage[i].addr); } break;
    685 #endif     
    686682    }
    687683  }
     
    700696    "    DOS users  : Remove any TSR's and device drivers you can.\n"
    701697    "    UNIX users : Do you have a swapfile/partition setup?\n";
    702 #ifdef __WATCOMC__
    703 static char const *not_enough_low_memory_message =
    704     "Memory Manager : Not enough low memory available (%d : need %d)\n"
    705     "  Suggestions...\n"
    706     "    - make a boot disk\n"
    707     "    - remove TSRs & drivers not needed by ABUSE\n"
    708     "    - add memory to your system\n";
    709 #endif
    710698
    711699void jmalloc_init(int32_t min_size)
     
    750738    bmanage_total++;      */
    751739
    752 #ifdef __WATCOMC__
    753     if (size!=jmalloc_max_size)
    754     {
    755       do
    756       {
    757         size=low_memory_available();
    758         if (size>jmalloc_min_low_size+0x1000)              // save 64K for misc low memory needs
    759         {
    760           bmanage[bmanage_total].init(alloc_low_memory(size-jmalloc_min_low_size-0x1000),size-jmalloc_min_low_size-0x1000,LOW_BLOCK);
    761           bmanage_total++;
    762           fprintf(stderr,"Added low memory block (%d bytes)\n",size);
    763         }
    764       } while (size>jmalloc_min_low_size+0x1000);
    765       if (size<jmalloc_min_low_size)
    766       {
    767         fprintf(stderr,not_enough_low_memory_message,size,jmalloc_min_low_size);
    768         exit(0);
    769       }
    770     }
    771 #endif
    772  
    773740    fprintf(stderr,"Memory available : %d\n",j_available());
    774741    if (j_available()<min_size)
  • abuse/trunk/src/imlib/specs.cpp

    r86 r90  
    330330
    331331//  int old_mask=umask(S_IRWXU | S_IRWXG | S_IRWXO);
    332 #ifdef __WATCOMC__
    333   flags|=O_BINARY;
    334 #endif
    335332  if (flags&O_WRONLY)
    336333  {
  • abuse/trunk/src/imlib/system.h

    r57 r90  
    1919
    2020
    21 #if defined( __WATCOMC__ )
    22   // they didn't include this def in their math include
    23   #ifndef M_PI
    24     #define M_PI 3.141592654
    25   #endif
    26   // so stuff can find proper file ops
    27   #include <io.h>
    28 #elif defined( __POWERPC__ )
    29   // they didn't include this def in their math include
    30   #ifndef M_PI
    31     #define M_PI 3.141592654
    32   #endif
    33         #include <unistd.h>
    34 #else
    35   // so apps can find unlink
    36   #include <unistd.h>
    37   #include <stdint.h>
    38 #endif
    39 
     21#include <unistd.h>
     22#include <stdint.h>
    4023
    4124#define uint16_swap(x) (((((uint16_t) (x)))<<8)|((((uint16_t) (x)))>>8))
Note: See TracChangeset for help on using the changeset viewer.