--- seti_boinc/db/schema_master.h.orig	2006-11-04 10:18:01.000000000 -0800
+++ seti_boinc/db/schema_master.h.orig	2006-11-04 10:25:03.000000000 -0800
@@ -611,8 +611,8 @@ 
 class  classic_versions  : public db_table<classic_versions> {
     public:
         long  id;
-        long  major;
-        long  minor;
+        long  _major;
+        long  _minor;
         long  platformid;
         char  comment[254];
         char  filename[254];
@@ -641,8 +641,8 @@ 
     public:
         long  id;
         long  versionid;
-        long  major;
-        long  minor;
+        long  _major;
+        long  _minor;
         classic_active_versions();
         classic_active_versions(const classic_active_versions &a);
         classic_active_versions(const SQL_ROW &a);
--- seti_boinc/db/schema_master.cpp.orig	2006-11-04 10:17:50.000000000 -0800
+++ seti_boinc/db/schema_master.cpp.orig	2006-11-04 10:23:59.000000000 -0800
@@ -6162,8 +6162,8 @@ 
 classic_versions::classic_versions() :
         db_table<classic_versions>(*this,-1),
         id(0),
-        major(0),
-        minor(0),
+        _major(0),
+        _minor(0),
         platformid(0),
 file_cksum(0) {
     db_open();
@@ -6178,8 +6178,8 @@ 
 classic_versions::classic_versions(const classic_versions &a) :
         db_table<classic_versions>(*this,-1),
         id(a.id),
-        major(a.major),
-        minor(a.minor),
+        _major(a._major),
+        _minor(a._minor),
         platformid(a.platformid),
 file_cksum(a.file_cksum) {
     db_open();
@@ -6212,8 +6212,8 @@ 
 classic_versions &classic_versions::operator =(const classic_versions &a) {
     if (&a != this) {
         id=a.id;
-        major=a.major;
-        minor=a.minor;
+        _major=a._major;
+        _minor=a._minor;
         platformid=a.platformid;
         file_cksum=a.file_cksum;
         strcpy(comment,a.comment);
@@ -6255,9 +6255,9 @@ 
     if (show_ids)
         rv << id;
     rv << ',';
-    rv << major;
+    rv << _major;
     rv << ',';
-    rv << minor;
+    rv << _minor;
     rv << ',';
     rv << platformid;
     rv << ',';
@@ -6284,8 +6284,8 @@ 
     xml_indent(2);
     if (show_ids)
         rv << xml_indent() << "<id>" << id << "</id>\n";
-    rv << xml_indent() << "<major>" << major << "</major>\n";
-    rv << xml_indent() << "<minor>" << minor << "</minor>\n";
+    rv << xml_indent() << "<major>" << _major << "</major>\n";
+    rv << xml_indent() << "<minor>" << _minor << "</minor>\n";
     rv << xml_indent() << "<platformid>" << platformid << "</platformid>\n";
     {
         std::string enc_field=xml_encode_string(comment,std::min(strlen(comment),sizeof(comment)));
@@ -6337,7 +6337,7 @@ 
                 pos++;
             } while(sub[pos]=='\n');
             std::istringstream in(sub.c_str()+pos);
-            in >> major;
+            in >> _major;
         }
         if (extract_xml_record(field,"minor",sub)) {
             pos=sub.find(">");
@@ -6345,7 +6345,7 @@ 
                 pos++;
             } while(sub[pos]=='\n');
             std::istringstream in(sub.c_str()+pos);
-            in >> minor;
+            in >> _minor;
         }
         if (extract_xml_record(field,"platformid",sub)) {
             pos=sub.find(">");
@@ -6443,11 +6443,11 @@ 
     }
     {
         std::istringstream row(*(s[1]));
-        row >> major;
+        row >> _major;
     }
     {
         std::istringstream row(*(s[2]));
-        row >> minor;
+        row >> _minor;
     }
     {
         std::istringstream row(*(s[3]));
@@ -6498,8 +6498,8 @@ 
         db_table<classic_active_versions>(*this,-1),
         id(0),
         versionid(0),
-        major(0),
-minor(0) {
+        _major(0),
+_minor(0) {
     db_open();
 }
 
@@ -6508,8 +6508,8 @@ 
         db_table<classic_active_versions>(*this,-1),
         id(a.id),
         versionid(a.versionid),
-        major(a.major),
-minor(a.minor) {
+        _major(a._major),
+_minor(a._minor) {
     db_open();
 }
 
@@ -6536,8 +6536,8 @@ 
     if (&a != this) {
         id=a.id;
         versionid=a.versionid;
-        major=a.major;
-        minor=a.minor;
+        _major=a._major;
+        _minor=a._minor;
     }
     return (*this);
 }
@@ -6574,9 +6574,9 @@ 
     rv << ',';
     rv << versionid;
     rv << ',';
-    rv << major;
+    rv << _major;
     rv << ',';
-    rv << minor;
+    rv << _minor;
     return rv.str();
 }
 
@@ -6590,8 +6590,8 @@ 
     if (show_ids)
         rv << xml_indent() << "<id>" << id << "</id>\n";
     rv << xml_indent() << "<versionid>" << versionid << "</versionid>\n";
-    rv << xml_indent() << "<major>" << major << "</major>\n";
-    rv << xml_indent() << "<minor>" << minor << "</minor>\n";
+    rv << xml_indent() << "<major>" << _major << "</major>\n";
+    rv << xml_indent() << "<minor>" << _minor << "</minor>\n";
     xml_indent(-2);
     rv << xml_indent() << "</" << tag << ">\n";
     return rv.str();
@@ -6624,7 +6624,7 @@ 
                 pos++;
             } while(sub[pos]=='\n');
             std::istringstream in(sub.c_str()+pos);
-            in >> major;
+            in >> _major;
         }
         if (extract_xml_record(field,"minor",sub)) {
             pos=sub.find(">");
@@ -6632,7 +6632,7 @@ 
                 pos++;
             } while(sub[pos]=='\n');
             std::istringstream in(sub.c_str()+pos);
-            in >> minor;
+            in >> _minor;
         }
     }
 }
@@ -6648,11 +6648,11 @@ 
     }
     {
         std::istringstream row(*(s[2]));
-        row >> major;
+        row >> _major;
     }
     {
         std::istringstream row(*(s[3]));
-        row >> minor;
+        row >> _minor;
     }
 }