publish changes

Src/nu/AutoChar.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_AUTOCHARH
 #define NULLSOFT_AUTOCHARH
 #ifdef WIN32
-#include <windows.h>
+#include <arch.h>
 
 
 inline char *AutoCharDupN(const wchar_t *convert, size_t len, UINT codePage = CP_ACP, UINT flags=0)

Src/nu/AutoCharFn.h

@@ -8,7 +8,7 @@
 #endif
 
 
-#include <windows.h>
+#include <arch.h>
 #include <shlwapi.h>
 
 class AutoCharFn

Src/nu/AutoHeader.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_AUTOHEADERH
 #define NULLSOFT_AUTOHEADERH
 
-#include <windows.h>
+#include <arch.h>
 #include "AutoChar.h"
 
 

Src/nu/AutoLock.h

@@ -3,7 +3,7 @@
 #define AUTOLOCKH
 
 #ifdef _WIN32
-#include <windows.h>
+#include <arch.h>
 #else
 #include <CoreServices/CoreServices.h>
 #endif
@@ -22,7 +22,7 @@ any threads using the mutex, and their function stack
 #include <deque> // we make a list of the recursive function stack for each thread
 #include <map> // and map
 #include <iostream> // we output to std::cerr
-#include <windows.h>
+#include <arch.h>
 
 
 /*****

Src/nu/AutoUrl.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_AUTOURLH
 #define NULLSOFT_AUTOURLH
 
-#include <windows.h>
+#include <arch.h>
 #include "AutoChar.h"
 
 /* benski> i'm sure there's a nice optimized way of doing this, but I need to implement it _right now_ */

Src/nu/AutoWide.h

@@ -1,7 +1,7 @@
 #ifndef AUTOWIDEH
 #define AUTOWIDEH
 #ifdef WIN32
-#include <windows.h>
+#include <arch.h>
 
 inline wchar_t *AutoWideDup( const char *convert, UINT codePage = CP_ACP )
 {

Src/nu/AutoWideFn.h

@@ -8,7 +8,7 @@
 #define REMOVE_FILENAME_SIZE
 #endif
 
-#include <windows.h>
+#include <arch.h>
 #include "AutoWide.h"
 #include "AutoChar.h"
 #include <shlwapi.h> 

Src/nu/CCVersion.cpp

@@ -1,5 +1,5 @@
 #include "CCVersion.h"
-#include <windows.h>
+#include <arch.h>
 #include <commctrl.h>
 #include <shlwapi.h>
 

Src/nu/CCVersion.h

@@ -1,6 +1,6 @@
 #ifndef NULLSOFT_CCVERSIONH
 #define NULLSOFT_CCVERSIONH
-#include <windows.h>
+#include <arch.h>
 DWORD GetCommCtrlDllVersion(LPCTSTR);
 #define PACKVERSION(major,minor) MAKELONG(minor,major)
 #endif

Src/nu/CGlobalAtom.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include  <windows.h>
+#include  <arch.h>
 class CGlobalAtom
 {
 public:

Src/nu/ComboBox.h

@@ -1,6 +1,6 @@
 #ifndef NULLSOFT_UTILITY_COMBOBOX_H
 #define NULLSOFT_UTILITY_COMBOBOX_H
-#include <windows.h>
+#include <arch.h>
 class ComboBox
 {
 public:

Src/nu/Config.h

@@ -2,7 +2,7 @@
 #define NULLSOFT_UTILITY_CONFIGH
 #include <string>
 #include <map>
-#include <windows.h>
+#include <arch.h>
 
 typedef std::wstring tstring;
 

Src/nu/LockFreeItem.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <windows.h>
+#include <arch.h>
 
 /* This data structure holds one item, and returns you the old item when you replace it 
    it's sort of a "stack of 1" */

Src/nu/LockFreeStack.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <windows.h>
+#include <arch.h>
 
 /* lock free stack object 
 multiple threads can push and pop without locking

Src/nu/MainThread.h

@@ -1,6 +1,6 @@
 #ifndef NULLSOFT_MAINTHREADH
 #define NULLSOFT_MAINTHREADH
-#include <windows.h>
+#include <arch.h>
 class Lambda
 {
 public:

Src/nu/MediaLibraryInterface.h

@@ -2,7 +2,7 @@
 #ifndef MEDIALIBRARYINTERFACEH
 #define MEDIALIBRARYINTERFACEH
 
-#include <windows.h>
+#include <arch.h>
 #include <tchar.h>
 
 #include "..\Plugins\General\gen_ml/ml.h"

Src/nu/NonBlockLock.h

@@ -1,7 +1,7 @@
 #pragma warning (disable:4786)
 #ifndef NONBLOCKLOCKH
 #define NONBLOCKLOCKH
-#include <windows.h>
+#include <arch.h>
 
 
 /*
@@ -20,7 +20,7 @@ any threads using the mutex, and their function stack
 #include <deque> // we make a list of the recursive function stack for each thread
 #include <map> // and map
 #include <iostream> // we output to std::cerr
-#include <windows.h>
+#include <arch.h>
 #endif
 
 /*****

Src/nu/Slider.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <windows.h>
+#include <arch.h>
 #include <commctrl.h>
 class Slider
 {

Src/nu/VideoClock.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <windows.h>
+#include <arch.h>
 
 namespace nu
 {

Src/nu/comboskin.h

@@ -1,7 +1,7 @@
 #ifndef _COMBOSKIN_H
 #define _COMBOSKIN_H
 
-#include <windows.h>
+#include <arch.h>
 
 class ComboSkin
 {

Src/nu/cstrlib.cpp

@@ -1,6 +1,6 @@
 /* Utility library for C strings */
 
-#include <windows.h>
+#include <arch.h>
 
 extern "C" 
 char *scanstr_back(char *str, char *toscan, char *defval)

Src/nu/listview.cpp

@@ -16,7 +16,7 @@
 **
 */
 
-#include <windows.h>
+#include <arch.h>
 #include <commctrl.h>
 
 #include "listview.h"

Src/nu/listview.h

@@ -19,8 +19,8 @@
 #ifndef _LISTVIEW_H_
 #define _LISTVIEW_H_
 
-#include <windows.h>
-#include <windowsx.h>
+#include <arch.h>
+#include <archx.h>
 #include <commctrl.h>
 
 #ifndef LVS_EX_DOUBLEBUFFER  //this will work XP only

Src/nu/menushortcuts.h

@@ -5,7 +5,7 @@
 #pragma once
 #endif
 
-#include <windows.h>
+#include <arch.h>
 
 #define MSF_REPLACE			0x0000
 #define MSF_APPEND			0x0001

Src/nu/ns_wc.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <windows.h>
+#include <arch.h>
 
 #ifdef __cplusplus
 extern "C"

Src/nu/refcount.h

@@ -1,6 +1,6 @@
 #pragma once
 #define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include <arch.h>
 template <class ifc_t>
 class Countable : public ifc_t
 {

Src/nu/simple_rwlock.h

@@ -6,7 +6,7 @@ not meant for high-throughput uses
 this is useful when writes are very infrequent
 */
 #include <bfc/platform/types.h>
-#include <windows.h>
+#include <arch.h>
 
 typedef size_t simple_rwlock_t;
 static const size_t simple_rwlock_writer_active = 1; // writer active flag

Src/nu/smalheap.c

@@ -9,7 +9,7 @@
 *******************************************************************************/
 #include <stdlib.h>
 #include <malloc.h>
-#include <windows.h>
+#include <arch.h>
 
 #define BYTES_PER_PARA      16
 #define DWORDS_PER_PARA     4

Src/nu/strsafe.h

@@ -6400,7 +6400,7 @@ STRSAFE_INLINE_API StringGetsExWorkerW(wchar_t* pszDest, size_t cchDest, size_t
 #pragma deprecated(gets)
 #pragma deprecated(_getws)
 
-// Then all the windows.h names - we need to undef and redef based on UNICODE setting
+// Then all the arch.h names - we need to undef and redef based on UNICODE setting
 #undef lstrcpy
 #undef lstrcat
 #undef wsprintf

Src/nu/threadname.h

@@ -2,7 +2,7 @@
 #define NULLSOFT_UTILITY_THREADNAME_H
 
 #ifdef _DEBUG
-#include <windows.h>
+#include <arch.h>
 
 typedef struct tagTHREADNAME_INFO
 {

Src/nu/threadpool/ThreadID.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <windows.h>
+#include <arch.h>
 #include "ThreadFunctions.h"
 #include "threadpool_types.h"
 #include <vector>

Src/nu/threadpool/ThreadPool.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <windows.h>
+#include <arch.h>
 #include <bfc/platform/types.h>
 #include <vector>
 #include "../autolock.h"

Src/nu/threadpool/TimerHandle.hpp

@@ -5,7 +5,7 @@
 #error Must define _WIN32_WINNT >= 0x400 to use TimerHandle
 #endif
 
-#include <windows.h>
+#include <arch.h>
 #include <bfc/platform/types.h>
 /*
 TimerHandle() constructor will make a new timer handle

Src/nu/threadpool/api_threadpool.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <windows.h>
+#include <arch.h>
 #include <bfc/platform/types.h>
 #include <bfc/dispatch.h>
 

Src/nu/threadpool/threadpool_types.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <deque>
-#include <windows.h>
+#include <arch.h>
 namespace ThreadPoolTypes
 {
 	typedef std::deque<HANDLE> HandleList;

Src/nu/windowsTheme.cpp

@@ -1,4 +1,4 @@
-#include "./windowsTheme.h"
+#include "./archTheme.h"
 #include <shlwapi.h>
 
 

Src/nu/winstr.c

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #ifdef __cplusplus
 extern "C" {
 #endif