bleehCVS: ----------------------------------------------------------------------

2 files changed, 5 insertions, 1 deletions

diff --git a/generic/Makefile b/generic/Makefile
index dc47586..98317b8 100755
--- a/generic/Makefile
+++ b/generic/Makefile
@@ -3,7 +3,7 @@
 CPPFLAGS=-Wall -g -O3 -mcpu=i686 -pedantic -pedantic-errors -I../includes
 CXX=g++
 
-OBJECTS = Buffer.o Exceptions.o Handle.o Image.o Input.o Output.o String.o generic.o fileutils.o
+OBJECTS = Buffer.o Exceptions.o Handle.o Image.o Input.o Output.o generic.o fileutils.o String.o
 TARGET = generic.a
 
 all: ${TARGET}
diff --git a/generic/String.cpp b/generic/String.cpp
index 786c623..49b4e4d 100644
--- a/generic/String.cpp
+++ b/generic/String.cpp
@@ -3,7 +3,9 @@
 #include <stdarg.h>
 #include "String.h"
 #include "Exceptions.h"
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 extern "C" {
     double dateCalc(char *, char *);
@@ -43,6 +45,7 @@ String::String(unsigned int i) {
     siz = ::strlen(str);
 }
 
+#ifdef USE_LONGLONG
 String::String(long long l) {
     char t[40];
 
@@ -58,6 +61,7 @@ String::String(unsigned long long l) {
     str = Base::strdup(t);
     siz = ::strlen(str);
 }
+#endif
 
 String::String(double d) {
     char t[30];