From: <web...@pr...> - 2017-03-12 18:52:57
|
Author: entryway Date: Sun Mar 12 18:52:46 2017 New Revision: 4519 Log: move findstate_t to e6y_launcher.c (Fabian Greffrath) The problem is that this struct references the PATH_MAX macro, which is not available on certain Unix flavors, i.e. Hurd. But on Unix systems, the launcher isn't built anyway. Modified: branches/prboom-plus-24/prboom2/src/e6y.h branches/prboom-plus-24/prboom2/src/e6y_launcher.c Modified: branches/prboom-plus-24/prboom2/src/e6y.h ============================================================================== --- branches/prboom-plus-24/prboom2/src/e6y.h Sat Mar 4 18:44:16 2017 (r4518) +++ branches/prboom-plus-24/prboom2/src/e6y.h Sun Mar 12 18:52:46 2017 (r4519) @@ -309,19 +309,6 @@ dboolean ProcessNoTagLines(line_t* line, sector_t **sec, int *secnum); -#define I_FindName(a) ((a)->Name) -#define I_FindAttr(a) ((a)->Attribs) - -typedef struct -{ - unsigned int Attribs; - unsigned int Times[3*2]; - unsigned int Size[2]; - unsigned int Reserved[2]; - char Name[PATH_MAX]; - char AltName[14]; -} findstate_t; - char* PathFindFileName(const char* pPath); void NormalizeSlashes2(char *str); unsigned int AfxGetFileName(const char* lpszPathName, char* lpszTitle, unsigned int nMax); Modified: branches/prboom-plus-24/prboom2/src/e6y_launcher.c ============================================================================== --- branches/prboom-plus-24/prboom2/src/e6y_launcher.c Sat Mar 4 18:44:16 2017 (r4518) +++ branches/prboom-plus-24/prboom2/src/e6y_launcher.c Sun Mar 12 18:52:46 2017 (r4519) @@ -65,6 +65,19 @@ #define LAUNCHER_CAPTION PACKAGE_NAME" Launcher" +#define I_FindName(a) ((a)->Name) +#define I_FindAttr(a) ((a)->Attribs) + +typedef struct +{ + unsigned int Attribs; + unsigned int Times[3*2]; + unsigned int Size[2]; + unsigned int Reserved[2]; + char Name[PATH_MAX]; + char AltName[14]; +} findstate_t; + typedef struct { char name[PATH_MAX]; |