Changeset 4100 for zzuf


Ignore:
Timestamp:
Dec 7, 2009, 1:36:15 PM (10 years ago)
Author:
Sam Hocevar
Message:

Synchronise Win32 port with recent config.h changes.

Location:
zzuf/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • zzuf/trunk/msvc/config.h

    r4041 r4100  
    4141/* #undef HAVE_FREOPEN64 */
    4242/* #undef HAVE_FSEEKO */
    43 #define HAVE_FSEEKO64 1
     43/* #undef HAVE_FSEEKO64 */
    4444/* #undef HAVE_FSETPOS64 */
    4545/* #undef HAVE_FTELLO */
    46 #define HAVE_FTELLO64 1
     46/* #undef HAVE_FTELLO64 */
    4747/* #undef HAVE_GETCHAR_UNLOCKED */
    4848/* #undef HAVE_GETC_UNLOCKED */
    4949/* #undef HAVE_GETDELIM */
    5050/* #undef HAVE_GETLINE */
    51 #define HAVE_GETOPT_H 1
    52 #define HAVE_GETOPT_LONG 1
     51/* #undef HAVE_GETOPT_H */
     52/* #undef HAVE_GETOPT_LONG */
    5353#define HAVE_GETPAGESIZE 1
    54 #define HAVE_GETTIMEOFDAY 1
     54/* #undef HAVE_GETTIMEOFDAY */
    5555/* #undef HAVE_GLIBC_FP */
    5656#define HAVE_INTTYPES_H 1
     
    5858/* #undef HAVE_KILL */
    5959/* #undef HAVE_LIBC_H */
    60 #define HAVE_LSEEK64 1
     60/* #undef HAVE_LSEEK64 */
    6161#define HAVE_MALLOC_H 1
    6262/* #undef HAVE_MAP_FD */
     
    9393/* #undef HAVE_SYS_SOCKET_H */
    9494#define HAVE_SYS_STAT_H 1
    95 #define HAVE_SYS_TIME_H 1
     95/* #undef HAVE_SYS_TIME_H */
    9696#define HAVE_SYS_TYPES_H 1
    9797/* #undef HAVE_SYS_UIO_H */
    9898/* #undef HAVE_SYS_WAIT_H */
    99 #define HAVE_UNISTD_H 1
     99/* #undef HAVE_UNISTD_H */
    100100/* #undef HAVE_VALLOC */
    101101/* #undef HAVE_WAITPID */
     
    130130/* #undef __func__ */
    131131
     132/* Fucking Visual Studio should just shut the fuck up with this fucking
     133 * warning about fucking ISO C++ when we fucking compile fucking C. */
     134#pragma warning(disable: 4996)
     135
    132136/* Win32-specific, of course. */
    133137typedef signed long long int int64_t;
  • zzuf/trunk/msvc/libzzuf.vcxproj

    r3971 r4100  
    6363    </ClCompile>
    6464    <Link>
    65       <AdditionalDependencies>imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     65      <AdditionalDependencies>imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    6666      <GenerateDebugInformation>true</GenerateDebugInformation>
    6767      <SubSystem>Windows</SubSystem>
     
    8888    </ClCompile>
    8989    <Link>
    90       <AdditionalDependencies>imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     90      <AdditionalDependencies>imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    9191      <GenerateDebugInformation>true</GenerateDebugInformation>
    9292      <SubSystem>Windows</SubSystem>
  • zzuf/trunk/msvc/zzuf.sln

    r1729 r4100  
    1 Microsoft Visual Studio Solution File, Format Version 8.00
    2 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zzuf", "zzuf.vcproj", "{2E5723ED-A886-45A9-AAAC-3D02F2EFC358}"
    3         ProjectSection(ProjectDependencies) = postProject
    4         EndProjectSection
     1Microsoft Visual Studio Solution File, Format Version 11.00
     2# Visual Studio 2010
     3Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zzuf", "zzuf.vcxproj", "{2E5723ED-A886-45A9-AAAC-3D02F2EFC358}"
    54EndProject
    6 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzzuf", "libzzuf.vcproj", "{E658DCE5-E1E5-41C8-910B-1CC2D73C435C}"
    7         ProjectSection(ProjectDependencies) = postProject
    8         EndProjectSection
     5Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzzuf", "libzzuf.vcxproj", "{E658DCE5-E1E5-41C8-910B-1CC2D73C435C}"
    96EndProject
    107Global
    11         GlobalSection(SolutionConfiguration) = preSolution
    12                 Debug = Debug
    13                 Release = Release
     8        GlobalSection(SolutionConfigurationPlatforms) = preSolution
     9                Debug|Win32 = Debug|Win32
     10                Release|Win32 = Release|Win32
    1411        EndGlobalSection
    15         GlobalSection(ProjectConfiguration) = postSolution
    16                 {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Debug.ActiveCfg = Debug|Win32
    17                 {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Debug.Build.0 = Debug|Win32
    18                 {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Release.ActiveCfg = Release|Win32
    19                 {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Release.Build.0 = Release|Win32
    20                 {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Debug.ActiveCfg = Debug|Win32
    21                 {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Debug.Build.0 = Debug|Win32
    22                 {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Release.ActiveCfg = Release|Win32
    23                 {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Release.Build.0 = Release|Win32
     12        GlobalSection(ProjectConfigurationPlatforms) = postSolution
     13                {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Debug|Win32.ActiveCfg = Debug|Win32
     14                {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Debug|Win32.Build.0 = Debug|Win32
     15                {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Release|Win32.ActiveCfg = Release|Win32
     16                {2E5723ED-A886-45A9-AAAC-3D02F2EFC358}.Release|Win32.Build.0 = Release|Win32
     17                {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Debug|Win32.ActiveCfg = Debug|Win32
     18                {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Debug|Win32.Build.0 = Debug|Win32
     19                {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Release|Win32.ActiveCfg = Release|Win32
     20                {E658DCE5-E1E5-41C8-910B-1CC2D73C435C}.Release|Win32.Build.0 = Release|Win32
    2421        EndGlobalSection
    25         GlobalSection(ExtensibilityGlobals) = postSolution
    26         EndGlobalSection
    27         GlobalSection(ExtensibilityAddIns) = postSolution
     22        GlobalSection(SolutionProperties) = preSolution
     23                HideSolutionNode = FALSE
    2824        EndGlobalSection
    2925EndGlobal
  • zzuf/trunk/src/debug.c

    r4009 r4100  
    153153        {
    154154            double g = va_arg(args, double), h = 0.0000001;
    155             int i = g;
     155            int i = (int)g;
    156156            WRITE_INT(_zz_debugfd, i, 10);
    157157            for(i = 0; i < 7; i++)
  • zzuf/trunk/src/zzuf.c

    r4009 r4100  
    351351            opts->seed = atol(myoptarg);
    352352            opts->endseed = tmp ? tmp[1] ? (uint32_t)atol(tmp + 1)
    353                                          : (uint32_t)-1UL
     353                                         : (uint32_t)-1L
    354354                                : opts->seed + 1;
    355355            break;
Note: See TracChangeset for help on using the changeset viewer.