View | Details | Raw Unified
Collapse All | Expand All

(-) h/InfoBox.hpp.orig (-26 / +16 lines)
 Lines 10-18    Link Here  
LIB = ../lib
LIB = ../lib

        
LARGEFILE = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
LARGEFILE = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE

            

              
INCLUDE = -I../../h -I${TVISION_PREFIX}/include/tvision -I${LIBXML2_PREFIX}/include/libxml2

              
INCLUDE =-I/usr/include/db4.1 -I../../h -I${TVISION_PREFIX}/include/tvision -I${LIBXML2_PREFIX}/include/libxml2

            

            

              
CFLAGS = -g ${LARGEFILE} -Wall ${INCLUDE} -D_DEBUG_HARDER_=1

              
CFLAGS+= -g ${LARGEFILE} -Wall ${INCLUDE} -D_DEBUG_HARDER_=1

            

            

              
CPPFLAGS = -fexceptions -Wall -Wno-deprecated

              
CPPFLAGS+= -fexceptions -Wall -Wno-deprecated

            

        

        
CLEANFILES = *.o core *~ *.so *.o.lib
CLEANFILES = *.o core *~ *.so *.o.lib

        

  

    

    

       Lines 76-86
       
    
  Link Here 
    

  

        
plugins: ${PLUGINS} ${PLUGINSCPP}
plugins: ${PLUGINS} ${PLUGINSCPP}

        

        
${PLUGINS}: %.so: %.o ${SHAREDPLOBJ} ${SHAREDPLOBJCPP} Makefile
${PLUGINS}: %.so: %.o ${SHAREDPLOBJ} ${SHAREDPLOBJCPP} Makefile

            

              
	${CPP} -shared \

              
	${CPP} ${CFLAGS} -shared \

            

        
		-fPIC -o $@ ${SHAREDPLOBJ} ${SHAREDPLOBJCPP} `basename $@ .so`.o -lpthread -lc
		-fPIC -o $@ ${SHAREDPLOBJ} ${SHAREDPLOBJCPP} `basename $@ .so`.o -lpthread -lc

        

        
${PLUGINSCPP}:	%.so: %.o ${SHAREDPLOBJ} ${SHAREDPLOBJCPP} Makefile
${PLUGINSCPP}:	%.so: %.o ${SHAREDPLOBJ} ${SHAREDPLOBJCPP} Makefile

            

              
	${CPP} -shared \

              
	${CPP} ${CFLAGS} -shared \

            

        
		-fPIC -o $@ ${SHAREDPLOBJ} ${SHAREDPLOBJCPP} `basename $@ .so`.o -lpthread -lc
		-fPIC -o $@ ${SHAREDPLOBJ} ${SHAREDPLOBJCPP} `basename $@ .so`.o -lpthread -lc

        

        
clean: 
clean: 

  

    

    

       Lines 102-113
       
    
  Link Here 
    

  

        
	${CPP} -fpic -c ${CFLAGS} ${CPPFLAGS} ../../shared/`basename $@ .o`.cc
	${CPP} -fpic -c ${CFLAGS} ${CPPFLAGS} ../../shared/`basename $@ .o`.cc

        

        
depend: makedep
depend: makedep

            

              
	echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep

              
	cat makedep >> Makefile

            

            

              
	echo '$$r makedep' >>eddep

              

            

            

              
	echo 'w' >>eddep

              

            

            

              
	cp Makefile Makefile.bak

              

            

            

              
	ex - Makefile < eddep

              

            

            

              
	rm eddep makedep makedep1 makedeperrs

              

            

        

        
CFILES  = ../../server/*.c ../../server/*.cpp ../../shared/*.c ../../shared/*.cc \
CFILES  = ../../server/*.c ../../server/*.cpp ../../shared/*.c ../../shared/*.cc \

        
	  ../../server/plugins/*.c ../../server/plugins/*.cc
	  ../../server/plugins/*.c ../../server/plugins/*.cc

  

    

    

       Lines 13-20
       
    
  Link Here 
    

  

        

        
LARGEFILE = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
LARGEFILE = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE

        
INCLUDE = -I../../h -I${TVISION_PREFIX}/include/tvision -I${LIBXML2_PREFIX}/include/libxml2
INCLUDE = -I../../h -I${TVISION_PREFIX}/include/tvision -I${LIBXML2_PREFIX}/include/libxml2

            

              
CFLAGS = -g ${LARGEFILE} -Wall ${INCLUDE} -D_DEBUG_HARDER_=1 -D`uname -m`

              
CFLAGS+= -g ${LARGEFILE} -Wall ${INCLUDE} -D_DEBUG_HARDER_=1 -D`uname -m`

            

            

              
CPPFLAGS = -fexceptions -D`uname -m`

              
CPPFLAGS+= -fexceptions -D`uname -m`

            

        

        
CLEANFILES = *.o core *~ *.so *.o.lib
CLEANFILES = *.o core *~ *.so *.o.lib

        

  

    

    

       Lines 68-79
       
    
  Link Here 
    

  

        
#	${CC} -fpic -c ${CFLAGS} ../shared/llseek_pic.c
#	${CC} -fpic -c ${CFLAGS} ../shared/llseek_pic.c

        

        
depend: makedep
depend: makedep

            

              
	echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep

              
	cat makedep >> Makefile

            

            

              
	echo '$$r makedep' >>eddep

              

            

            

              
	echo 'w' >>eddep

              

            

            

              
	cp Makefile Makefile.bak

              

            

            

              
	ex - Makefile < eddep

              

            

            

              
	rm eddep makedep makedep1 makedeperrs

              

            

        

        
CFILES  = ../../shared/*.c ../../shared/*.cc ../../client/network/*.c \
CFILES  = ../../shared/*.c ../../shared/*.cc ../../client/network/*.c \

        
	  ../../client/sysinfo/*.c ../../client/gui/*.cc 
	  ../../client/sysinfo/*.c ../../client/gui/*.cc 

  

    

    

       Lines 105-111
       
    
  Link Here 
    

  

        
       throw std::runtime_error("Unable to parse input stream.");
       throw std::runtime_error("Unable to parse input stream.");

        
    }
    }

        

            

              
    friend class Parser : public xml::event_parser

              
    class Parser : public xml::event_parser

            

        
    {
    {

        
    public:
    public:

        
      Parser(drive_info *d) : di_(d) {}
      Parser(drive_info *d) : di_(d) {}

  

    

    

       Lines 141-147
       
    
  Link Here 
    

  

        

        
    private:
    private:

        
      drive_info *di_;
      drive_info *di_;

            

              
    }; // friend class Parser

              
    }; // class Parser

            

        

        
  };
  };

        

  

    

    

       Lines 197-203
       
    
  Link Here 
    

  

        
  /* Figure out how many hash types we have. */
  /* Figure out how many hash types we have. */

        
  for (hid = static_cast<hashid>(0);
  for (hid = static_cast<hashid>(0);

        
       hid <= static_cast<hashid>(mhash_count());
       hid <= static_cast<hashid>(mhash_count());

            

              
       ++(static_cast<int>(hid))) {

              
       ++hid) {

            

        

        
    const char *name = 0;
    const char *name = 0;

        

  

    

    

       Lines 30-36
       
    
  Link Here 
    

  

        
#define Uses_TEvent
#define Uses_TEvent

        
#define Uses_MsgBox
#define Uses_MsgBox

        
#include <tvision/tv.h>
#include <tvision/tv.h>

            

              
#include <tvision/dialogs.h>

              
#include <tvision/tv/dialogs.h>

            

        

        
class ButtonDlg : public TDialog
class ButtonDlg : public TDialog

        
{
{

  

    

    

       Lines 30-36
       
    
  Link Here 
    

  

        
#define Uses_TEvent
#define Uses_TEvent

        
#define Uses_TStaticText
#define Uses_TStaticText

        
#include <tvision/tv.h>
#include <tvision/tv.h>

            

              
#include <tvision/dialogs.h>

              
#include <tvision/tv/dialogs.h>

            

        

        
#include "ProgressBar.hpp"
#include "ProgressBar.hpp"

        

  

    

    

       Lines 34-40
       
    
  Link Here 
    

  

        
#define Uses_TFilterValidator
#define Uses_TFilterValidator

        

        
#include <tvision/tv.h>
#include <tvision/tv.h>

            

              
#include <tvision/msgbox.h>

              
#include <tvision/tv/msgbox.h>

            

        
#include "ButtonDlg.hpp"
#include "ButtonDlg.hpp"

        

        

  

    

    

       Lines 37-43
       
    
  Link Here 
    

  

        
#define Uses_TStaticText
#define Uses_TStaticText

        

        
#include <tvision/tv.h>
#include <tvision/tv.h>

            

              

              
#include <tvision/tv/sttctext.h>

            

        

        
extern void postInfo(int, const char *);
extern void postInfo(int, const char *);