[xiph-commits] r18656 - icecast/branches/ph3/icecast/src

[ph3-der-loewe at svn.xiph.org]

Author: ph3-der-loewe
Date: 2012-10-12 07:48:28 -0700 (Fri, 12 Oct 2012)
New Revision: 18656

Modified:
   icecast/branches/ph3/icecast/src/auth_htpasswd.c
   icecast/branches/ph3/icecast/src/main.c
Log:
sync with master

Modified: icecast/branches/ph3/icecast/src/auth_htpasswd.c
===================================================================
--- icecast/branches/ph3/icecast/src/auth_htpasswd.c	2012-10-12 14:41:12 UTC (rev 18655)
+++ icecast/branches/ph3/icecast/src/auth_htpasswd.c	2012-10-12 14:48:28 UTC (rev 18656)
@@ -34,11 +34,11 @@
 
 #include "logging.h"
 #define CATMODULE "auth_htpasswd"
-
-#ifdef WIN32
-#define snprintf _snprintf
-#endif
 
+#ifdef WIN32
+#define snprintf _snprintf
+#endif
+
 static auth_result htpasswd_adduser (auth_t *auth, const char *username, const char *password);
 static auth_result htpasswd_deleteuser(auth_t *auth, const char *username);
 static auth_result htpasswd_userlist(auth_t *auth, xmlNodePtr srcnode);

Modified: icecast/branches/ph3/icecast/src/main.c
===================================================================
--- icecast/branches/ph3/icecast/src/main.c	2012-10-12 14:41:12 UTC (rev 18655)
+++ icecast/branches/ph3/icecast/src/main.c	2012-10-12 14:48:28 UTC (rev 18656)
@@ -418,12 +418,12 @@
    }
 #endif
 }
-
+
 #ifdef WIN32_SERVICE
-int mainService(int argc, char **argv)
-#else
-int main(int argc, char **argv)
-#endif
+int mainService(int argc, char **argv)
+#else
+int main(int argc, char **argv)
+#endif
 {
     int res, ret;
     char filename[512];