Branch: refs/heads/master
Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com>
Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com>
Date: Mon, 13 Jul 2015 16:46:17 UTC
Commit: 87496f657dccb4294e08e7566116b0e5f4edf591
https://github.com/geany/geany/commit/87496f657dccb4294e08e7566116b0e5f4edf…
Log Message:
-----------
Cleanup win32defines
The git PR for this change contains a long explanation.
Modified Paths:
--------------
src/Makefile.am
src/socket.c
src/spawn.c
src/win32.c
src/win32defines.h
Modified: src/Makefile.am
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -149,7 +149,7 @@ WINDRES = $(host_alias)-windres
geany_private.res: $(top_srcdir)/geany_private.rc
$(WINDRES) -i $(top_srcdir)/geany_private.rc --input-format=rc -o $@ -O coff
-libgeany_la_SOURCES += win32.c win32.h win32defines.h
+libgeany_la_SOURCES += win32.c win32.h
libgeany_la_LIBADD += -lole32 -lwsock32 -lcomdlg32
libgeany_la_LDFLAGS += -Wl,-luuid -mwindows -mms-bitfields -no-undefined
geany_LDFLAGS += -mwindows -mms-bitfields
Modified: src/socket.c
2 lines changed, 0 insertions(+), 2 deletions(-)
===================================================================
@@ -57,8 +57,6 @@
#ifdef HAVE_SOCKET
-#include "win32defines.h" /* should always come before any system headers */
-
#include "socket.h"
#include "app.h"
Modified: src/spawn.c
2 lines changed, 0 insertions(+), 2 deletions(-)
===================================================================
@@ -47,8 +47,6 @@
# include "config.h"
#endif
-#include "win32defines.h" /* should always come before any system headers */
-
#include <errno.h>
#include <string.h>
Modified: src/win32.c
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -27,7 +27,10 @@
# include "config.h"
#endif
-#include "win32defines.h" /* should always come before any system headers */
+/* Need Windows XP for SHGetFolderPathAndSubDirW */
+#define _WIN32_WINNT 0x0501
+/* Needed for SHGFP_TYPE */
+#define _WIN32_IE 0x0500
#include "win32.h"
Modified: src/win32defines.h
32 lines changed, 0 insertions(+), 32 deletions(-)
===================================================================
@@ -1,32 +0,0 @@
-/*
- * win32defines.h - this file is part of Geany, a fast and lightweight IDE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef WIN32DEFINES_H
-#define WIN32DEFINES_H 1
-
-/* These defines are necessary defines *before* windows.h is included */
-
-#define VC_EXTRALEAN
-#define WIN32_LEAN_AND_MEAN
-/* Need Windows XP for SHGetFolderPathAndSubDirW */
-#define WINVER 0x0501
-#define _WIN32_WINNT 0x0501
-/* Needed for SHGFP_TYPE */
-#define _WIN32_IE 0x0500
-
-#endif /* WIN32DEFINES_H */
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Sun, 12 Jul 2015 22:47:18 UTC
Commit: 0f5e379ec8199ba68f7fa44e642d210a71df7d40
https://github.com/geany/geany/commit/0f5e379ec8199ba68f7fa44e642d210a71df7…
Log Message:
-----------
Update making-a-release
* geany.nsi and doc/geany.html are now generated;
* freecode.com is dead.
Modified Paths:
--------------
doc/making-a-release
Modified: doc/making-a-release
5 lines changed, 2 insertions(+), 3 deletions(-)
===================================================================
@@ -8,11 +8,10 @@ and summarize the interesting ones. Use `git log --author='name'`
to filter commits by a particular developer name.
Ensure version numbers are all updated in:
- configure.ac geany.nsi geany_private.rc geany.exe.manifest
+ configure.ac geany_private.rc geany.exe.manifest
win32-config.h wscript doc/geany.txt
Ensure release date is updated in:
NEWS doc/geany.txt doc/geany.1.in
-Regenerate doc/geany.html.
Check GEANY_CODENAME is set in src/geany.h.
Export the code into a new directory (i.e. not usual working copy).
@@ -41,7 +40,7 @@ current/hacking.html too.
Announce on geany, devel, i18n mailing lists (check you're subscribed).
Put a news item on SourceForge (https://sourceforge.net/news/?group_id=153444)
-and a new release on freecode.com (https://freecode.com/projects/geany).
+and a new release on GitHub (https://github.com/geany/geany/releases).
For non-master releases, merge NEWS into master and any branch-only
commits that need to merged.
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Sun, 12 Jul 2015 15:50:15 UTC
Commit: ffe7206cc85801e93f5f12d4e43ce7fcb854f9c5
https://github.com/geany/geany/commit/ffe7206cc85801e93f5f12d4e43ce7fcb854f…
Log Message:
-----------
Merge pull request #570 from eht16/win32_header_order
Include win32defines.h before win32.h to fix build errors
Modified Paths:
--------------
src/socket.c
src/spawn.c
src/win32.c
src/win32defines.h
Modified: src/socket.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -57,6 +57,8 @@
#ifdef HAVE_SOCKET
+#include "win32defines.h" /* should always come before any system headers */
+
#include "socket.h"
#include "app.h"
@@ -79,7 +81,6 @@
# include <netinet/in.h>
# include <glib/gstdio.h>
#else
-# include "win32defines.h"
# include <winsock2.h>
# include <windows.h>
# include <gdk/gdkwin32.h>
Modified: src/spawn.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -47,13 +47,14 @@
# include "config.h"
#endif
+#include "win32defines.h" /* should always come before any system headers */
+
#include <errno.h>
#include <string.h>
#include "spawn.h"
#ifdef G_OS_WIN32
-# include "win32defines.h"
# include <ctype.h> /* isspace() */
# include <fcntl.h> /* _O_RDONLY, _O_WRONLY */
# include <io.h> /* _open_osfhandle, _close */
Modified: src/win32.c
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -27,12 +27,12 @@
# include "config.h"
#endif
+#include "win32defines.h" /* should always come before any system headers */
+
#include "win32.h"
#ifdef G_OS_WIN32
-#include "win32defines.h"
-
#include "dialogs.h"
#include "document.h"
#include "editor.h"
@@ -982,14 +982,14 @@ gchar *win32_get_shortcut_target(const gchar *file_name)
gchar *path = NULL;
wchar_t *wfilename = g_utf8_to_utf16(file_name, -1, NULL, NULL, NULL);
HWND hWnd = NULL;
-
+
if (main_widgets.window != NULL)
{
GdkWindow *window = gtk_widget_get_window(main_widgets.window);
if (window != NULL)
hWnd = GDK_WINDOW_HWND(window);
}
-
+
resolve_link(hWnd, wfilename, &path);
g_free(wfilename);
Modified: src/win32defines.h
63 lines changed, 32 insertions(+), 31 deletions(-)
===================================================================
@@ -1,31 +1,32 @@
-/*
- * win32defines.h - this file is part of Geany, a fast and lightweight IDE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef WIN32DEFINES_H
-#define WIN32DEFINES_H 1
-
-/* These defines are necessary defines *before* windows.h is included */
-
-#define VC_EXTRALEAN
-#define WIN32_LEAN_AND_MEAN
-/* Need Windows XP for SHGetFolderPathAndSubDirW */
-#define WINVER 0x0501
-/* Needed for SHGFP_TYPE */
-#define _WIN32_IE 0x0500
-
-#endif /* WIN32DEFINES_H */
+/*
+ * win32defines.h - this file is part of Geany, a fast and lightweight IDE
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef WIN32DEFINES_H
+#define WIN32DEFINES_H 1
+
+/* These defines are necessary defines *before* windows.h is included */
+
+#define VC_EXTRALEAN
+#define WIN32_LEAN_AND_MEAN
+/* Need Windows XP for SHGetFolderPathAndSubDirW */
+#define WINVER 0x0501
+#define _WIN32_WINNT 0x0501
+/* Needed for SHGFP_TYPE */
+#define _WIN32_IE 0x0500
+
+#endif /* WIN32DEFINES_H */
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Sun, 12 Jul 2015 15:40:30 UTC
Commit: e5471fb5cedd11ed508971f909939da95a628c15
https://github.com/geany/geany/commit/e5471fb5cedd11ed508971f909939da95a628…
Log Message:
-----------
Include win32defines.h before win32.h to fix build errors
Modified Paths:
--------------
src/socket.c
src/spawn.c
src/win32.c
src/win32defines.h
Modified: src/socket.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -57,6 +57,8 @@
#ifdef HAVE_SOCKET
+#include "win32defines.h" /* should always come before any system headers */
+
#include "socket.h"
#include "app.h"
@@ -79,7 +81,6 @@
# include <netinet/in.h>
# include <glib/gstdio.h>
#else
-# include "win32defines.h"
# include <winsock2.h>
# include <windows.h>
# include <gdk/gdkwin32.h>
Modified: src/spawn.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -43,13 +43,14 @@
# include "config.h"
#endif
+#include "win32defines.h" /* should always come before any system headers */
+
#include <errno.h>
#include <string.h>
#include "spawn.h"
#ifdef G_OS_WIN32
-# include "win32defines.h"
# include <ctype.h> /* isspace() */
# include <fcntl.h> /* _O_RDONLY, _O_WRONLY */
# include <io.h> /* _open_osfhandle, _close */
Modified: src/win32.c
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -27,12 +27,12 @@
# include "config.h"
#endif
+#include "win32defines.h" /* should always come before any system headers */
+
#include "win32.h"
#ifdef G_OS_WIN32
-#include "win32defines.h"
-
#include "dialogs.h"
#include "document.h"
#include "editor.h"
@@ -982,14 +982,14 @@ gchar *win32_get_shortcut_target(const gchar *file_name)
gchar *path = NULL;
wchar_t *wfilename = g_utf8_to_utf16(file_name, -1, NULL, NULL, NULL);
HWND hWnd = NULL;
-
+
if (main_widgets.window != NULL)
{
GdkWindow *window = gtk_widget_get_window(main_widgets.window);
if (window != NULL)
hWnd = GDK_WINDOW_HWND(window);
}
-
+
resolve_link(hWnd, wfilename, &path);
g_free(wfilename);
Modified: src/win32defines.h
63 lines changed, 32 insertions(+), 31 deletions(-)
===================================================================
@@ -1,31 +1,32 @@
-/*
- * win32defines.h - this file is part of Geany, a fast and lightweight IDE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef WIN32DEFINES_H
-#define WIN32DEFINES_H 1
-
-/* These defines are necessary defines *before* windows.h is included */
-
-#define VC_EXTRALEAN
-#define WIN32_LEAN_AND_MEAN
-/* Need Windows XP for SHGetFolderPathAndSubDirW */
-#define WINVER 0x0501
-/* Needed for SHGFP_TYPE */
-#define _WIN32_IE 0x0500
-
-#endif /* WIN32DEFINES_H */
+/*
+ * win32defines.h - this file is part of Geany, a fast and lightweight IDE
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef WIN32DEFINES_H
+#define WIN32DEFINES_H 1
+
+/* These defines are necessary defines *before* windows.h is included */
+
+#define VC_EXTRALEAN
+#define WIN32_LEAN_AND_MEAN
+/* Need Windows XP for SHGetFolderPathAndSubDirW */
+#define WINVER 0x0501
+#define _WIN32_WINNT 0x0501
+/* Needed for SHGFP_TYPE */
+#define _WIN32_IE 0x0500
+
+#endif /* WIN32DEFINES_H */
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).