Index: Core/App.h
===================================================================
RCS file: /tmp/uppcvs/uppsrc/Core/App.h,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 App.h
--- Core/App.h	18 Jan 2006 13:38:52 -0000	1.1.1.1
+++ Core/App.h	18 Jan 2006 12:57:25 -0000
@@ -54,7 +54,7 @@
 
 #ifdef PLATFORM_POSIX
 
-int AppInit__(int argc, const char **argv, const char **envptr);
+void AppInit__(int argc, const char **argv, const char **envptr);
 
 #define CONSOLE_APP_MAIN \
 void ConsoleMainFn_(); \
Index: Core/Path.cpp
===================================================================
RCS file: /tmp/uppcvs/uppsrc/Core/Path.cpp,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 Path.cpp
--- Core/Path.cpp	18 Jan 2006 13:38:52 -0000	1.1.1.1
+++ Core/Path.cpp	18 Jan 2006 12:56:56 -0000
@@ -643,7 +643,7 @@
 	return res;
 #elif defined(PLATFORM_POSIX)
 	struct utimbuf ub;
-	ub.actime = ub.modtime = TimeToFileTime(time);
+	ub.actime = ub.modtime = time(NULL);
 	return !utime(ToSystemCharset(filename), &ub);
 #else
 	#error
Index: CtrlCore/CtrlCore.h
===================================================================
RCS file: /tmp/uppcvs/uppsrc/CtrlCore/CtrlCore.h,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 CtrlCore.h
--- CtrlCore/CtrlCore.h	18 Jan 2006 13:38:56 -0000	1.1.1.1
+++ CtrlCore/CtrlCore.h	18 Jan 2006 12:57:48 -0000
@@ -1388,7 +1388,7 @@
 
 #ifdef PLATFORM_POSIX
 
-int AppInit__(int argc, const char **argv, const char **envptr);
+void AppInit__(int argc, const char **argv, const char **envptr);
 
 #define GUI_APP_MAIN \
 void GuiMainFn_(); \
Index: CtrlCore/X11Keys.h
===================================================================
RCS file: /tmp/uppcvs/uppsrc/CtrlCore/X11Keys.h,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 X11Keys.h
--- CtrlCore/X11Keys.h	18 Jan 2006 13:38:56 -0000	1.1.1.1
+++ CtrlCore/X11Keys.h	18 Jan 2006 13:05:57 -0000
@@ -103,6 +103,7 @@
 K_CTRL_LBRACKET  = K_CTRL|XK_bracketleft|K_DELTA,
 K_CTRL_RBRACKET  = K_CTRL|XK_bracketright|K_DELTA,
 K_CTRL_MINUS     = K_CTRL|XK_minus|K_DELTA,
+K_CTRL_COMMA     = K_CTRL|XK_comma|K_DELTA,
 K_CTRL_GRAVE     = K_CTRL|XK_grave|K_DELTA,
 K_CTRL_SLASH     = K_CTRL|XK_slash|K_DELTA,
 K_CTRL_BACKSLASH = K_CTRL|XK_backslash|K_DELTA,
Index: ide/SelectPkg.cpp
===================================================================
RCS file: /tmp/uppcvs/uppsrc/ide/SelectPkg.cpp,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 SelectPkg.cpp
--- ide/SelectPkg.cpp	18 Jan 2006 13:38:52 -0000	1.1.1.1
+++ ide/SelectPkg.cpp	18 Jan 2006 13:22:35 -0000
@@ -313,6 +313,7 @@
 
 void FixName(const String& dir, const String& name, String& case_fixed)
 {
+#if defined(PLATFORM_WIN32)
 	if(IsFullPath(name))
 		return;
 	String rp = AppendFileName(dir, name);
@@ -321,6 +322,11 @@
 		return;
 	MoveFile(rp, rp);
 	case_fixed << '&' << DeQtf(rp);
+#elif defined(PLATFORM_POSIX)
+//TODO ???
+#else
+#error
+#endif
 }
 
 bool IsMainPackage(const String& dd, const String& nm, String& case_fixed)
Index: ide/UppDlg.cpp
===================================================================
RCS file: /tmp/uppcvs/uppsrc/ide/UppDlg.cpp,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 UppDlg.cpp
--- ide/UppDlg.cpp	18 Jan 2006 13:38:52 -0000	1.1.1.1
+++ ide/UppDlg.cpp	18 Jan 2006 13:26:06 -0000
@@ -294,7 +294,7 @@
 void PackageEditor::OptionMenu(Bar& bar)
 {
 	bool b = !IsNull(actualpackage);
-	bar.Add(b, "Add package..", IdeImg::package_add(), THISBACK1(AddOption, USES));
+	bar.Add(b, "Add package..", IdeImg::package_add(), THISBACK1(AddOption, (int)USES));
 	for(int j = FLAG; j <= COMPILER; j++)
 		if(j != USES)
 			bar.Add(b, "New " + opt_name[j] + "..", THISBACK1(AddOption, j));
@@ -351,7 +351,7 @@
 	bar.Add(b, "Add dependency..", THISBACK(AddDepends));
 	bar.Separator();
 	b = fileoption.IsCursor() && (int)fileoption.Get(0) >= 0;
-	int type = b ? fileoption.Get(0) : -1;
+	int type = b ? (int)fileoption.Get(0) : -1;
 	bar.Add(b, "Edit..", THISBACK(EditFileOption));
 	bar.Add(b, "Remove", THISBACK(RemoveFileOption));
 	bar.Separator();
Index: ide/ide.h
===================================================================
RCS file: /tmp/uppcvs/uppsrc/ide/ide.h,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 ide.h
--- ide/ide.h	18 Jan 2006 13:38:52 -0000	1.1.1.1
+++ ide/ide.h	18 Jan 2006 13:14:23 -0000
@@ -669,7 +669,7 @@
 		void   Statistics();
 		void   Exit();
 		String GetOpposite();
-		void   Opposite();
+		void   OnOpposite();
 
 
 	void      Edit(Bar& menu);
Index: ide/idebar.cpp
===================================================================
RCS file: /tmp/uppcvs/uppsrc/ide/idebar.cpp,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 idebar.cpp
--- ide/idebar.cpp	18 Jan 2006 13:38:52 -0000	1.1.1.1
+++ ide/idebar.cpp	18 Jan 2006 13:24:08 -0000
@@ -36,7 +36,7 @@
 
 	menu.AddMenu(AK_EDITFILE, CtrlImg::open(), THISBACK(EditAnyFile))
 		.Help("Select any file in file selector and open it in editor");
-	menu.AddMenu(!IsNull(GetOpposite()), AK_OPPOSITE, IdeImg::opposite(), THISBACK(Opposite))
+	menu.AddMenu(!IsNull(GetOpposite()), AK_OPPOSITE, IdeImg::opposite(), THISBACK(OnOpposite))
 		.Help("Switch between source and header file");
 	menu.AddMenu(AK_SAVEFILE, CtrlImg::save(), THISBACK(DoSaveFile))
 		.Help("Save current file");
Index: ide/idefile.cpp
===================================================================
RCS file: /tmp/uppcvs/uppsrc/ide/idefile.cpp,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 idefile.cpp
--- ide/idefile.cpp	18 Jan 2006 13:38:52 -0000	1.1.1.1
+++ ide/idefile.cpp	18 Jan 2006 13:14:53 -0000
@@ -540,7 +540,7 @@
 	return Null;
 }
 
-void Ide::Opposite()
+void Ide::OnOpposite()
 {
 	String fn = GetOpposite();
 	if(!IsNull(fn))