Changeset 72f476b in git


Ignore:
Timestamp:
Jun 9, 2010, 12:28:01 PM (14 years ago)
Author:
Mohamed Barakat <mohamed.barakat@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
c08834bf50b47d2b3cb0fead54ea4d7bdd59b433
Parents:
56abc3642a555178d4967c093c099b3244d33e84
git-author:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2010-06-09 12:28:01+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:55:05+01:00
Message:
renamed output -> reporter, moved part of reporter.h -> auxiliary.h
Files:
1 edited
8 moved

Legend:

Unmodified
Added
Removed

  • misc/aux.h

    r56abc3 r72f476b  
    22
    33/*******************************************************************
    4  *  File:    aux.h
     4 *  File:    auxiliary.h
    55 *  Purpose:
    66 *  Author: 
    … …  
    1010
    1111// BOOLEAN
    12 // max, min?
    13 
    1412
    1513#ifndef _MISC_AUX_H
    1614#define _MISC_AUX_H
    1715
    18 #define TRUE 1
    19 #define FALSE 0
     16#if (SIZEOF_LONG == 8)
     17typedef int BOOLEAN;
     18/* testet on x86_64, gcc 3.4.6: 2 % */
     19/* testet on IA64, gcc 3.4.6: 1 % */
     20#else
     21/* testet on athlon, gcc 2.95.4: 1 % */
     22typedef short BOOLEAN;
     23#endif
     24
     25#ifndef FALSE
     26#define FALSE       0
     27#endif
     28
     29#ifndef TRUE
     30#define TRUE        1
     31#endif
    2032
    2133#ifndef NULL
    22 #define NULL        (0)
     34#define NULL        ((void *)(0))
    2335#endif
    2436
    … …  
    3244typedef void* ADDRESS;
    3345
    34 #if (SIZEOF_LONG == 8)
    35 typedef int BOOLEAN;
    36 /* testet on x86_64, gcc 3.4.6: 2 % */
    37 /* testet on IA64, gcc 3.4.6: 1 % */
    38 #else
    39 /* testet on athlon, gcc 2.95.4: 1 % */
    40 typedef short BOOLEAN;
    41 #endif
    4246#define loop for(;;)
    4347

  • reporter/Makefile.in

    r56abc3 r72f476b  
    4646
    4747# normal C++ source files
    48 CXXSOURCES=output.cc
     48CXXSOURCES=reporter.cc
    4949
    5050# normal C source files
    … …  
    5353SOURCES=${CSOURCES} ${CXXSOURCES}
    5454
    55 HEADERS=output.h
     55HEADERS=reporter.h
    5656
    5757DISTFILES=${SOURCES} ${HEADERS}
    … …  
    6464        ${CC} ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
    6565
    66 output.a: ${OBJS}
    67         -rm -f output.a
     66reporter.a: ${OBJS}
     67        -rm -f reporter.a
    6868        ar cr $@ $^
    6969
    70 all: output.a
     70all: reporter.a
    7171
    7272install: all
    7373        ${MKINSTALLDIRS} ${includedir}
    7474        ${MKINSTALLDIRS} ${libdir}
    75         ${INSTALL_DATA} output.a ${libdir}/liboutput.a
    76         ${INSTALL_DATA} output.h ${includedir}/output.h
     75        ${INSTALL_DATA} reporter.a ${libdir}/libreporter.a
     76        ${INSTALL_DATA} reporter.h ${includedir}/reporter.h
    7777
    7878##

  • reporter/configure.ac

    r56abc3 r72f476b  
    44AC_PREREQ(2.61)
    55AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
    6 AC_CONFIG_SRCDIR([output.h])
     6AC_CONFIG_SRCDIR([reporter.h])
    77AC_CONFIG_HEADER([config.h])
    88

  • reporter/dError.c

    r56abc3 r72f476b  
    1414#include <stdio.h>
    1515#include "config.h"
    16 #include "output.h"
     16#include "reporter.h"
    1717#ifdef HAVE_CONFIG_H
    1818#include <omalloc/omalloc.h>

  • reporter/reporter.cc

    r56abc3 r72f476b  
    2121#endif
    2222
    23 #include "output.h"
     23#include "reporter.h"
    2424#include "omalloc.h"
    2525//#include "options.h"

  • reporter/reporter.h

    r56abc3 r72f476b  
    1010#include <stdio.h>
    1111#include <string.h>
    12 
    13 #if (SIZEOF_LONG == 8)
    14 typedef int BOOLEAN;
    15 /* testet on x86_64, gcc 3.4.6: 2 % */
    16 /* testet on IA64, gcc 3.4.6: 1 % */
    17 #else
    18 /* testet on athlon, gcc 2.95.4: 1 % */
    19 typedef short BOOLEAN;
    20 #endif
    21 
    22 #ifndef FALSE
    23 #define FALSE       0
    24 #endif
    25 
    26 #ifndef TRUE
    27 #define TRUE        1
    28 #endif
    29 
    30 
     12#include <auxiliary.h>
    3113
    3214extern char*  feErrors;
    … …  
    7052void    PrintNSpaces(const int n);
    7153void    PrintLn();
    72 #ifdef HAVE_TCL
    73 void    PrintTCLS(const char c, const char * s);
    74 #else
    75 #define PrintTCLS(A,B) Print("TCL-ErrS:%s",B)
    76 #endif
    7754void    PrintS(const char* s);
    7855
    … …  
    8057}
    8158/* the C++-part: */
    82 
    83 #ifdef HAVE_TCL
    84 
    85 inline void PrintTCL(const char c, int l,const char *s)
    86 {
    87   if (s!=NULL) printf("%c:%d:%s",c,l,s);
    88   else if(l==0) printf("%c:0:",c);
    89   else printf("%c:1:%c",c,'0'+l);
    90   fflush(stdout);
    91 }
    92 #else
    93 #define PrintTCL(A,B,C) Print("TCL-Err:%s",C)
    94 #endif /* HAVE_TCL */
    9559
    9660char *  StringAppend(const char *fmt, ...);
Note: See TracChangeset for help on using the changeset viewer.