RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 05-Sep-2011 13:46:28 Branch: HEAD Handle: 2011090511462800 Modified files: popt CHANGES popt.c system.h Log: devzero2000: merge commit fc8836e from git pull request https://github.com/devzero2000/POPT/pull/2 "Fix more MSVC build warnings" by asenm (Matt Arsenault). This is the last commit of this patch series and pull request. Summary: Revision Changes Path 1.169 +5 -0 popt/CHANGES 1.160 +1 -0 popt/popt.c 1.25 +11 -2 popt/system.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: popt/CHANGES ============================================================================ $ cvs diff -u -r1.168 -r1.169 CHANGES --- popt/CHANGES 5 Sep 2011 11:35:53 -0000 1.168 +++ popt/CHANGES 5 Sep 2011 11:46:28 -0000 1.169 @@ -1,4 +1,9 @@ 1.17 -> 2.0: + - devzero2000: merge commit fc8836e from git pull request + https://github.com/devzero2000/POPT/pull/2 + "Fix more MSVC build warnings" + by asenm (Matt Arsenault). This is the last commit + of this patch series and pull request. - devzero2000: merge commit aee9f24 from git pull request https://github.com/devzero2000/POPT/pull/2 "Add makefile for mingw" @@ . patch -p0 <<'@@ .' Index: popt/popt.c ============================================================================ $ cvs diff -u -r1.159 -r1.160 popt.c --- popt/popt.c 16 Jun 2011 15:26:43 -0000 1.159 +++ popt/popt.c 5 Sep 2011 11:46:28 -0000 1.160 @@ -31,6 +31,7 @@ #define assert(_x) #endif + #ifdef MYDEBUG /*@unchecked@*/ int _popt_debug = 0; @@ . patch -p0 <<'@@ .' Index: popt/system.h ============================================================================ $ cvs diff -u -r1.24 -r1.25 system.h --- popt/system.h 5 Sep 2011 11:26:39 -0000 1.24 +++ popt/system.h 5 Sep 2011 11:46:28 -0000 1.25 @@ -3,7 +3,15 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +# ifndef _MSC_VER +# include "config.h" +# else +# include "config_msvc.h" +# endif /* _MSC_VER */ +#endif /* HAVE_CONFIG_H */ + +#if defined(_MSC_VER) || defined(__MINGW32__) +# define _CRT_SECURE_NO_WARNINGS 1 #endif @@ -66,9 +74,9 @@ #if defined(_MSC_VER) || defined(__MINGW32__) -#define _CRT_SECURE_NO_WARNINGS 1 #include <io.h> #include <malloc.h> +#include <process.h> #define F_OK 0 #define R_OK 4 #define W_OK 2 @@ -121,6 +129,7 @@ #define open _open #define close _close #define lseek _lseek +#define execvp _execvp /* Pretend to be root to replace these */ static inline int setuid(UNUSED(int x)) { return 1; } @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org