Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28725
Modified Files:
configure.ac dcraw.cc dcraw.h uf_glib.h ufraw.c ufraw_conf.c
ufraw_lens_ui.c ufraw_routines.c ufraw_saver.c
Log Message:
Use reserved macro _WIN32 instead of WIN32. _WIN32 is set by both 32-bit and
64-bit compilers.
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -d -r1.279 -r1.280
--- dcraw.cc 14 Mar 2013 07:20:27 -0000 1.279
+++ dcraw.cc 16 Mar 2013 05:15:13 -0000 1.280
@@ -79,7 +79,7 @@
#ifdef __CYGWIN__
#include <io.h>
#endif
-#ifdef WIN32
+#ifdef _WIN32
#include <sys/utime.h>
#include <winsock2.h>
#ifndef __MINGW32__ /* causes warnings in cygwin's gcc -mno-cygwin UF*/
@@ -3600,7 +3600,7 @@
free (fname);
if (errno != ERANGE) return;
}
-#if defined(WIN32) || defined(DJGPP)
+#if defined(_WIN32) || defined(DJGPP)
if (fname[1] == ':')
memmove (fname, fname+2, len-2);
for (cp=fname; *cp; cp++)
@@ -9457,7 +9457,7 @@
dcraw_message (DCRAW_ERROR,_("Will not write an image to the
terminal!\n"));
return 1;
}
-#if defined(WIN32) || defined(DJGPP) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(DJGPP) || defined(__CYGWIN__)
if (setmode(1,O_BINARY) < 0) {
perror ("setmode()");
return 1;
Index: ufraw_routines.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- ufraw_routines.c 1 Jan 2013 04:00:17 -0000 1.123
+++ ufraw_routines.c 16 Mar 2013 05:15:14 -0000 1.124
@@ -32,7 +32,7 @@
{
const char *hd = g_get_home_dir();
if (hd == NULL)
-#ifdef WIN32
+#ifdef _WIN32
hd = "C:\\";
#else
hd = "/";
@@ -59,7 +59,7 @@
char *localedir = g_strconcat(g_getenv("UFRAW_LOCALEDIR"), NULL);
if (localedir == NULL) {
/* If that fails, there are two defaults: */
-#ifdef WIN32
+#ifdef _WIN32
/* In Windows the localedir is found relative to the exe file.
* The exact location here should match ufraw-setup.iss.in */
char *basename = g_path_get_basename(exename);
Index: ufraw_lens_ui.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_lens_ui.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- ufraw_lens_ui.c 1 Jan 2013 04:00:17 -0000 1.46
+++ ufraw_lens_ui.c 16 Mar 2013 05:15:14 -0000 1.47
@@ -697,7 +697,7 @@
GtkNotebook *subnb = GTK_NOTEBOOK(gtk_notebook_new());
gtk_box_pack_start(GTK_BOX(page), GTK_WIDGET(subnb), TRUE, TRUE, 0);
-#ifndef WIN32
+#ifndef _WIN32
// This call causes a crash on win32
gtk_notebook_set_tab_pos(subnb, GTK_POS_LEFT);
#endif
Index: configure.ac
===================================================================
RCS file: /cvsroot/ufraw/ufraw/configure.ac,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- configure.ac 10 Mar 2013 09:00:08 -0000 1.167
+++ configure.ac 16 Mar 2013 05:15:13 -0000 1.168
@@ -215,7 +215,7 @@
AC_SEARCH_LIBS(getopt_long, gnugetopt, ,
AC_MSG_ERROR(can not build UFRaw without getopt_long))
-# The ws2_32 library is required for the ntohs symbol on WIN32.
+# The ws2_32 library is required for the ntohs symbol on win32.
if test $ufraw_win32 = yes; then
LIBS="$LIBS -lws2_32"
fi
Index: ufraw_conf.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_conf.c,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- ufraw_conf.c 3 Feb 2013 18:01:15 -0000 1.189
+++ ufraw_conf.c 16 Mar 2013 05:15:14 -0000 1.190
@@ -131,7 +131,7 @@
0, /* number of helper lines to draw */
"", "", /* curvePath, profilePath */
FALSE, /* silent */
-#ifdef WIN32
+#ifdef _WIN32
"gimp-win-remote gimp-2.8.exe", /* remoteGimpCommand */
#elif HAVE_GIMP_2_6
"gimp", /* remoteGimpCommand */
Index: ufraw_saver.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_saver.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- ufraw_saver.c 1 Jan 2013 04:00:17 -0000 1.66
+++ ufraw_saver.c 16 Mar 2013 05:15:14 -0000 1.67
@@ -116,7 +116,7 @@
* Therefore we must call it asynchronously. */
if (!g_spawn_command_line_async(commandLine, &err)) {
g_free(commandLine);
-#ifdef WIN32
+#ifdef _WIN32
if (strcmp(uf->conf->remoteGimpCommand,
conf_default.remoteGimpCommand) == 0) {
/* If the user didn't play with the remoteGimpCommand,
Index: uf_glib.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/uf_glib.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- uf_glib.h 1 Jan 2013 04:00:17 -0000 1.11
+++ uf_glib.h 16 Mar 2013 05:15:14 -0000 1.12
@@ -21,7 +21,7 @@
#include <glib/gstdio.h>
// g_win32_locale_filename_from_utf8 is needed only on win32
-#ifdef WIN32
+#ifdef _WIN32
#define uf_win32_locale_filename_from_utf8(__some_string__) \
g_win32_locale_filename_from_utf8(__some_string__)
#define uf_win32_locale_filename_free(__some_string__) g_free(__some_string__)
@@ -31,7 +31,7 @@
#endif
// On win32 command-line arguments need to be translated to UTF-8
-#ifdef WIN32
+#ifdef _WIN32
#define uf_win32_locale_to_utf8(__some_string__) \
g_locale_to_utf8(__some_string__, -1, NULL, NULL, NULL)
#define uf_win32_locale_free(__some_string__) g_free(__some_string__)
Index: ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- ufraw.c 3 Feb 2013 18:01:15 -0000 1.68
+++ ufraw.c 16 Mar 2013 05:15:14 -0000 1.69
@@ -43,7 +43,7 @@
g_free(gtkrcfile);
gtk_init(&argc, &argv);
ufraw_icons_init();
-#ifdef WIN32
+#ifdef _WIN32
dummyWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_icon_name(GTK_WINDOW(dummyWindow), "ufraw");
ufraw_message(UFRAW_SET_PARENT, (char *)dummyWindow);
Index: dcraw.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- dcraw.h 1 Jan 2013 04:00:16 -0000 1.75
+++ dcraw.h 16 Mar 2013 05:15:14 -0000 1.76
@@ -27,7 +27,7 @@
* 4. On other systems g_fopen is defined as a macro
* 5. g_fopen only exists since glib 2.6
*/
-#if !defined(DCRAW_NOMAIN) && defined(WIN32)
+#if !defined(DCRAW_NOMAIN) && defined(_WIN32)
#include <glib.h>
extern "C" {
#include <glib/gstdio.h>
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
