Changeset 4653 for zzufTweet

Timestamp:

Sep 22, 2010, 9:47:56 PM (9 years ago)

Author:

Sam Hocevar

Message:

Fix zzat compilation on Win32 and create a .vcxproj file for it.

Location:

zzuf/trunk

Files:

• msvc/config.h (modified) (1 diff)
• msvc/zzat.vcxproj (added)
• msvc/zzuf10.sln (modified) (3 diffs)
• src/zzat.c (modified) (4 diffs)

zzuf/trunk/msvc/config.h

@@ -33 +33 @@
 /* #undef HAVE_FGETLN */
 /* #undef HAVE_FGETS_UNLOCKED */
-#define HAVE_FOPEN64 1
+/* #undef HAVE_FOPEN64 */
 /* #undef HAVE_FORK */
 /* #undef HAVE_FREAD_UNLOCKED */

zzuf/trunk/msvc/zzuf10.sln

@@ -1 +1 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+# Visual C++ Express 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zzuf", "zzuf.vcxproj", "{2E5723ED-A886-45A9-AAAC-3D02F2EFC358}"
 EndProject
@@ -7 +7 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zznop", "zznop.vcxproj", "{04486051-18D2-402D-91C0-3E0A8F2FD0D7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zzat", "zzat.vcxproj", "{83987482-7F82-427E-7832-809F80AB809C}"
 EndProject
 Global
@@ -26 +28 @@
                 {04486051-18D2-402D-91C0-3E0A8F2FD0D7}.Release|Win32.ActiveCfg = Release|Win32
                 {04486051-18D2-402D-91C0-3E0A8F2FD0D7}.Release|Win32.Build.0 = Release|Win32
+                {83987482-7F82-427E-7832-809F80AB809C}.Debug|Win32.ActiveCfg = Debug|Win32
+                {83987482-7F82-427E-7832-809F80AB809C}.Debug|Win32.Build.0 = Debug|Win32
+                {83987482-7F82-427E-7832-809F80AB809C}.Release|Win32.ActiveCfg = Release|Win32
+                {83987482-7F82-427E-7832-809F80AB809C}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

zzuf/trunk/src/zzat.c

@@ -25 +25 @@
 /* Needed for getc_unlocked() on OpenSolaris */
 #define __EXTENSIONS__
+
+#if defined _MSC_VER
+#   include <io.h>
+typedef int ssize_t;
+#   define snprintf sprintf_s
+#   define close _close
+#endif
 
 #if defined HAVE_STDINT_H
@@ -136 +143 @@
             break;
         case 'r': /* --repeat */
-            repeat = atoi(optarg);
+            repeat = atoi(myoptarg);
             break;
         case 's': /* --squeeze-blank */
@@ -371 +378 @@
 }
 
-#define PARSECMD(fmt, arg...) \
+#define PARSECMD(fmt, ...) \
     (make_fmt(&parser, fmt) == sscanf(sequence, parser.tmpfmt, \
-                                      ##arg, &parser.ch) \
+                                      __VA_ARGS__, &parser.ch) \
          && parser.ch == parser.lastch)
 
@@ -578 +585 @@
 #endif
         else if (PARSECMD("rewind ( )"))
-            MY_FSEEK(rewind(f), -retlen);
+            MY_FSEEK(rewind(f), -(int)retlen);
         else if (PARSECMD("ungetc ( )"))
             MY_FSEEK(if(retoff) ungetc((unsigned char)retbuf[retoff - 1], f),