[paragui-cvs] CVS: paragui/src/core missing.cpp,1.1.2.1,1.1.2.2 pgapplication.cpp,1.2.4.4,1.2.4.5

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/core
In directory subversions:/tmp/cvs-serv31229/src/core

Modified Files:
      Tag: devel-1-0
        missing.cpp pgapplication.cpp 
Log Message:
final MacOS merge



Index: missing.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/Attic/missing.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** missing.cpp 2 May 2002 08:45:36 -0000       1.1.2.1
--- missing.cpp 31 May 2002 13:25:45 -0000      1.1.2.2
***************
*** 3,6 ****
--- 3,10 ----
  #ifndef HAVE_STRDUP
  char *strdup(char *s) {
+       if(s == NULL) {
+               return NULL;
+       }
+       
        int l = strlen(s) + 1;
        char *ret = (char *)malloc(l);

Index: pgapplication.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgapplication.cpp,v
retrieving revision 1.2.4.4
retrieving revision 1.2.4.5
diff -C2 -r1.2.4.4 -r1.2.4.5
*** pgapplication.cpp   31 May 2002 12:17:29 -0000      1.2.4.4
--- pgapplication.cpp   31 May 2002 13:25:45 -0000      1.2.4.5
***************
*** 42,48 ****
  
  #ifndef PARAGUI_THEMEDIR
! #define PARAGUI_THEMEDIR      "./"
! #endif        // PARAGUI_THEMEDIR
! 
  
  SDL_mutex* PG_Application::mutexScreen = NULL;
--- 42,51 ----
  
  #ifndef PARAGUI_THEMEDIR
! #ifdef __MACOS__
! #define PARAGUI_THEMEDIR        ""
! #else
! #define PARAGUI_THEMEDIR        "./"
! #endif  // macintosh
! #endif  // PARAGUI_THEMEDIR
  
  SDL_mutex* PG_Application::mutexScreen = NULL;