celeron55

diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h
index 8217729..c7d1233 100644
--- a/src/irrlichttypes.h
+++ b/src/irrlichttypes.h
@@ -24,14 +24,15 @@
 
 using namespace irr;
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__)

celeron55

diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h
index 8217729..535e9c4 100644
--- a/src/irrlichttypes.h
+++ b/src/irrlichttypes.h
@@ -26,12 +26,13 @@
 
 #ifdef _MSC_VER
        // Windows
-       typedef unsigned long long u64;
+       typedef __int64 s64;

celeron55

diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h
index 8217729..535e9c4 100644
--- a/src/irrlichttypes.h
+++ b/src/irrlichttypes.h
@@ -26,12 +26,13 @@
 
 #ifdef _MSC_VER
        // Windows
-       typedef unsigned long long u64;
+       typedef __int64 s64;

celeron55

Program terminated with signal 11, Segmentation fault.
#0  0x083c03f5 in irr::core::string<wchar_t, irr::core::irrAllocator<wchar_t> >::subString (this=0xa7f3c04, begin=0, length=11) at ../../include/irrString.h:792
792                             o.array[i] = array[i+begin];
(gdb) bt
#0  0x083c03f5 in irr::core::string<wchar_t, irr::core::irrAllocator<wchar_t> >::subString (this=0xa7f3c04, begin=0, length=11) at ../../include/irrString.h:792
#1  0x084b20fa in irr::gui::CGUIEditBox::calculateScrollPos (this=0xa7f3b78) at CGUIEditBox.cpp:1327
#2  0x084afe69 in irr::gui::CGUIEditBox::processKey (this=0xa7f3b78, event=...) at CGUIEditBox.cpp:676
#3  0x084ae737 in irr::gui::CGUIEditBox::OnEvent (this=0xa7f3b78, event=...) at CGUIEditBox.cpp:215
#4  0x083ad8c4 in irr::gui::CGUIEnvironment::postEventFromUser (this=0x9a60830, event=...) at CGUIEnvironment.cpp:593
#5  0x083a9bc6 in irr::CIrrDeviceStub::postEventFromUser (this=0x9811138, event=...) at CIrrDeviceStub.cpp:214

celeron55

[ 26%] Building CXX object src/CMakeFiles/minetest.dir/guiMainMenu.cpp.o
/home/celeron55/softat/minetest/src/guiMainMenu.cpp: In member function ‘virtual void GUIMainMenu::regenerateGui(v2u32)’:
/home/celeron55/softat/minetest/src/guiMainMenu.cpp:373:141: error: cannot allocate an object of abstract type ‘irr::gui::intlGUIEditBox’
In file included from /home/celeron55/softat/minetest/src/guiMainMenu.cpp:44:0:
/home/celeron55/softat/minetest/src/intlGUIEditBox.h:19:8: note:   because the following virtual functions are pure within ‘irr::gui::intlGUIEditBox’:
In file included from /home/celeron55/softat/minetest/src/guiMainMenu.cpp:29:0:
/usr/include/irrlicht/IGUIEditBox.h:38:21: note:        virtual irr::gui::IGUIFont* irr::gui::IGUIEditBox::getOverrideFont() const
/usr/include/irrlicht/IGUIEditBox.h:43:21: note:        virtual irr::gui::IGUIFont* irr::gui::IGUIEditBox::getActiveFont() const
/usr/include/irrlicht/IGUIEditBox.h:56:25: note:        virtual irr::video::SColor irr::gui::IGUIEditBox::getOverrideCol

celeron55

diff --git a/src/main.cpp b/src/main.cpp
index 73757cb..dce0027 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1349,7 +1349,13 @@ int main(int argc, char *argv[])
        skin->setColor(gui::EGDC_3D_SHADOW, video::SColor(255,0,0,0));
        skin->setColor(gui::EGDC_HIGH_LIGHT, video::SColor(255,70,100,50));
        skin->setColor(gui::EGDC_HIGH_LIGHT_TEXT, video::SColor(255,255,255,255));
-       
+

celeron55

diff --git a/src/main.cpp b/src/main.cpp
index 73757cb..ede9f63 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1349,7 +1349,13 @@ int main(int argc, char *argv[])
        skin->setColor(gui::EGDC_3D_SHADOW, video::SColor(255,0,0,0));
        skin->setColor(gui::EGDC_HIGH_LIGHT, video::SColor(255,70,100,50));
        skin->setColor(gui::EGDC_HIGH_LIGHT_TEXT, video::SColor(255,255,255,255));
-       
+

celeron55

Switched to a new branch 'stable'
[celeron55@localhost minetest]$ git merge master
Updating bc0e5c0..ab06fca
Fast-forward
 .gitignore                                                                                    |   40 +-
 .hgignore                                                                                     |   25 -
 .hgtags                                                                                       |    1 -
 CMakeLists.txt                                                                                |  113 +-
 README.txt                                                                                    |  184 ++-
 builtin/auth.lua                                                                              |  188 +++

celeron55

from django.db import models

class PhpbbUser(models.Model):
    """Model for phpBB user."""
    user_id = models.IntegerField(primary_key=True)
    user_active = models.BooleanField()
    username = models.CharField(max_length=25)
    user_password = models.CharField(max_length=32)
    user_posts = models.IntegerField()
    user_email = models.CharField(max_length=255)

celeron55

phpbb/models.py
---------------
from django.db import models

class PhpbbUser(models.Model):
    """Model for phpBB user."""
    user_id = models.IntegerField(primary_key=True)
    user_active = models.BooleanField()
    username = models.CharField(max_length=25)
    user_password = models.CharField(max_length=32)