Changeset 105


Ignore:
Timestamp:
03/02/2009 04:55:03 PM (15 years ago)
Author:
marcus
Message:
  • removed SUN compiler switches since it's toi only version left
Location:
SH_SHM/branches/marcus/source
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • SH_SHM/branches/marcus/source/basecnst.h

    r104 r105  
    6464 ******************************************************************/ 
    6565 
    66 /* possible flags for operating system are 
    67  * SH_SETUP_SUNOS 
    68  * SH_SETUP_LINUX 
    69  * SH_SETUP_AIX 
    70  * SH_SETUP_HPUX 
    71   * default is SH_SETUP_SUNOS 
    72  */ 
    73  
    74 #if defined(SH_SETUP_SUNOS) 
    75 #define cBc_OS_UNIX 
    76 #define cBc_OS_SUNOS 
    77 #elif defined(SH_SETUP_LINUX) 
    78 #define cBc_OS_UNIX 
    79 #define cBc_OS_LINUX 
    80 #elif defined(SH_SETUP_AIX) 
    81 #define cBc_OS_UNIX 
    82 #define cBc_OS_AIX 
    83 #elif defined(SH_SETUP_HPUX) 
    84 #define cBc_OS_UNIX 
    85 #define cBc_OS_HPUX 
    86 #else 
    87 #define cBc_OS_UNIX 
    88 #define cBc_OS_SUNOS 
    89 #endif 
    90  
    91 /* for compatibility (should be removed some time) */ 
    92 #ifdef cBc_OS_UNIX 
    93 #define BC_SUN 
    94 #define cBc_SUN 
    95 #endif 
    96  
    97  
    98  
    9966/* select graphics */ 
    10067#define BC_G_MEM 
    … …  
    13299        /* type clock_t is available */ 
    133100 
    134  
    135 /****************************************************************** 
    136  ***                         SUN version                        *** 
    137  ******************************************************************/ 
    138  
    139  
    140 #ifdef BC_SUN 
    141  
    142  
    143101/* only old style names */ 
    144102#define BC_SYSBASE "sysbase.h" 
    … …  
    172130 
    173131 
    174  
    175 #endif /* BC_SUN */ 
    176  
    177  
    178132/****************************************************************** 
    179133 ***                              END                           *** 

  • SH_SHM/branches/marcus/source/cpar.c

    r16 r105  
    3838#include "cpar.h" 
    3939 
    40  
    41 #ifdef BC_SUN 
    4240#define QUALCHAR1 '-' 
    4341#define QUALCHAR2 '-' 
    44 #else 
    45 #define QUALCHAR1 '-' 
    46 #define QUALCHAR2 '/' 
    47 #endif 
    48  
    49  
    5042 
    5143/* global variables */ 

  • SH_SHM/branches/marcus/source/errmsg.c

    r102 r105  
    9494        int      errline;                /* line number */ 
    9595        char     errfile[BC_LINELTH+1];  /* error file */ 
    96 #       ifdef BC_SUN                     /* needed on sun only */ 
    9796        char     *eptr;                  /* pointer to environment variable */ 
    98 #       endif 
    9997 
    10098        /* executable code */ 
    … …  
    102100        /* check error path */ 
    103101        if  (*emv_errdir == '\0')  { 
    104 #               ifdef BC_SUN 
    105102                eptr = GpGetString( cGpS_defpath_errors ); 
    106103                if  (eptr == NULL)  { 
    … …  
    113110                        strcpy( emv_errdir, eptr ); 
    114111                } /*endif*/ 
    115 #               endif 
    116112        } /*endif*/ 
    117113 

  • SH_SHM/branches/marcus/source/fileopen.c

    r16 r105  
    201201        } /*endwhile*/ 
    202202 
    203 #       ifdef BC_SUN 
    204203        cptr = getenv( logname ); 
    205204        if  (cptr != NULL)  { 
    … …  
    211210                if  (fp != NULL)  return fp; 
    212211        } /*endif*/ 
    213 #       endif 
    214212 
    215213        /* not found, open without translation */ 

  • SH_SHM/branches/marcus/source/newgraph/xwch.c

    r101 r105  
    1313#include <ctype.h> 
    1414#include BASECNST 
    15 #ifdef BC_SUN 
    1615#include <X11/Xlib.h> 
    1716#include <X11/Xatom.h> 
    1817#include <X11/cursorfont.h> 
    19 /* typedef char *caddr_t; */  /* I really don't know why this is necessary on HP */ 
    2018#include <X11/Xutil.h> 
    21 #endif 
    2219#include BC_SYSBASE 
    2320#include "graphbas.h" 

  • SH_SHM/branches/marcus/source/readgrn.h

    r101 r105  
    4141#endif 
    4242 
    43  
    44 #ifdef BC_SUN 
    4543#define SBYTE signed char 
    46 #else 
    47 #define SBYTE char 
    48 #endif 
    49  
    50  
    5144 
    5245/* error codes */ 

  • SH_SHM/branches/marcus/source/seed_io/seed_lib.c

    r101 r105  
    5555#include <math.h> 
    5656#include "basecnst.h" 
     57 
    5758#ifdef BC_INC_UNISTD 
    5859#include BC_INC_UNISTD 
    5960#endif 
     61 
    6062#ifdef BC_INC_STDLIB 
    6163#include BC_INC_STDLIB 
    6264#endif 
    63 #ifdef BC_SUN 
     65 
    6466#include <fcntl.h> 
    6567#include <sys/types.h> 
    66 /* #include <sys/uio.h> */ 
    67 #endif 
    6868#include "sysbase.h" 
    6969#include "tcusrdef.h" 

  • SH_SHM/branches/marcus/source/seed_io/seed_tidy.c

    r98 r105  
    2222#include <string.h> 
    2323#include "basecnst.h" 
     24 
    2425#ifdef BC_INC_STDLIB 
    2526#include BC_INC_STDLIB 
    2627#endif 
    27 #ifdef BC_SUN 
     28 
    2829#include <fcntl.h> 
    2930#include <sys/types.h> 
    3031#include <sys/uio.h> 
    31 #endif 
    3232#include "sysbase.h" 
    3333#include "erusrdef.h" 

  • SH_SHM/branches/marcus/source/seusrdef.h

    r16 r105  
    165165 
    166166 
    167 #ifdef BC_SUN 
    168  
    169167void se_get_sh_environment( void ); 
    170168 
    … …  
    174172 */ 
    175173 
    176 #endif 
    177  
    178174 
    179175/*------------------------------------------------------------------------*/ 

  • SH_SHM/branches/marcus/source/shconst.h

    r48 r105  
    4242#define GW 2 
    4343        /* graphics window */ 
    44 #ifdef BC_SUN 
    4544#define SHC_FILE_PREFIX "SH_" 
    46 #else 
    47 #define SHC_FILE_PREFIX "SH$" 
    48 #endif 
    4945        /* file prefix of all SeismicHandler files */ 
    5046#define SHC_FILE_PREFIX_LENGTH 3 

  • SH_SHM/branches/marcus/source/shdirs.h

    r102 r105  
    3737 
    3838/*=================================================================*/ 
    39 #ifdef BC_SUN 
    40  
    41  
    42  
    4339/* These values are not really needed.  The SH_... environment variables 
    4440 * have precedence over these definitions 
    … …  
    5450#define DD_EXTPROG "/home/geo/ks/shc/util/" 
    5551 
    56  
    57  
    58 #endif /* BC_SUN */ 
    5952/*=================================================================*/ 

  • SH_SHM/branches/marcus/source/shexec.c

    r103 r105  
    9797 
    9898        /* get path names: either from UNIX environment ... */ 
    99 #       ifdef BC_SUN 
    10099        se_get_sh_environment(); 
    101 #       endif 
    102100 
    103101        /* get session ID string */ 
    104102        strcpy( id_shv, SHC_FILE_PREFIX ); 
    105 #       ifdef BC_SUN 
    106103        mt_randomstr( 4, id_shv+SHC_FILE_PREFIX_LENGTH ); 
    107104        strcat( id_shv, "_" ); 
    108 #       endif  /* BC_SUN */ 
    109105 
    110106        strcpy( str, shd_scratch ); 
    … …  
    909905 
    910906 
    911 #ifdef BC_SUN 
    912  
    913  
    914907void se_get_sh_environment( void ) 
    915908 
    … …  
    936929 
    937930 
    938 #endif 
    939  
    940  
    941931 
    942932/*------------------------------------------------------------------------*/ 

  • SH_SHM/branches/marcus/source/shmenu0.c

    r104 r105  
    513513                if  (*status != SHE_NOERROR)  return; 
    514514                strcpy( str, "UNKNOWN" ); 
    515 #               ifdef BC_SUN 
    516515                strcpy( str, "UNIX" ); 
    517 #               endif 
    518516                sl_setsymbol( str2, str, &locstat ); 
    519517        } else if  (strcmp(str,"OSCALL") == 0)  { 

  • SH_SHM/branches/marcus/source/shmenu5.c

    r16 r105  
    490490                        *status = BC_NOERROR; 
    491491                } else { 
    492 #                       ifdef BC_SUN 
    493492                        *status = BC_NOERROR; 
    494 #                       else 
    495                         if  (Severe(status))  return; 
    496 #                       endif 
    497493                        if  (SHF_CHATTY & shflags_shv) 
    498494                                printf( "%s label is %s\n", SHC_CHATTXT, label ); 
    … …  
    17001696void mn5_fixgap( PARAM *par, STATUS *status ) 
    17011697 
    1702 /* removes  zeros from traces introducing a straight line  
     1698/* removes  zeros from traces introducing a straight line 
    17031699        connecting non-zero values 
    17041700 * par 1:    trace list 

  • SH_SHM/branches/marcus/source/sysbase.h

    r104 r105  
    4242#include "basecnst.h" 
    4343#endif 
    44  
    45 /****************************************************************** 
    46  ***                         SUN version                        *** 
    47  ******************************************************************/ 
    48  
    49 #ifdef BC_SUN 
    5044 
    5145/* short integer */ 
    … …  
    332326 
    333327 
    334  
    335 #endif /* BC_SUN */ 
    336  
    337  
    338  
    339 /****************************************************************** 
    340  ***                              END                           *** 
    341  ******************************************************************/ 
    342  
    343328#endif /* __SYSBASE */ 
    344329 

  • SH_SHM/branches/marcus/source/syscall.c

    r104 r105  
    3535 
    3636#include "basecnst.h" 
    37  
    38  
    39  
    40 /****************************************************************** 
    41  ***                         SUN version                        *** 
    42  ******************************************************************/ 
    43  
    44  
    45  
    46 #ifdef BC_SUN 
    47  
    4837 
    4938 
    … …  
    437426 
    438427/*----------------------------------------------------------------------------*/ 
    439  
    440  
    441  
    442 #endif /* BC_SUN */ 
    443  
    444  
    445  
    446 /****************************************************************** 
    447  ***                              END                           *** 
    448  ******************************************************************/ 
Note: See TracChangeset for help on using the changeset viewer.